fix import rightscale common