The following merge could be ignored. I did a commit to local master(which was stale copy of remote) and then pulled from
remote repo. Instead of doing a pull before commit.
And then I pushed to remote master which resulted into this merge.
So in effect this merge actually restored the changes lost by my commit.
Merge branch 'master' of https://github.com/CloudStack-QA/incubator-cloudstack
Merge branch 'master' of https://github.com/CloudStack-QA/incubator-cloudstack