Working on CLOUDSTACK-427 (hardcoded steps) and CLOUDSTACK-313 (cross references)
Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into 4.1