Working on CLOUDSTACK-427 (hardcoded steps) and CLOUDSTACK-313 (cross references)