master is broken

[Rajani Karuturi]

FYI,

master is broken due to a merge conflict.

I created PR https://github.com/apache/cloudstack/pull/1977 to
fix the same.

Will merge it ASAP.

~ Rajani

http://cloudplatform.accelerite.com/