Updated to work with rightscale_tools 1.5.7