Merge pull request #330 from rightscale/ivory_14_05_acu148335_syncup_branches

Ivory 14 05 acu148335 syncup branches
acu156548 rename vscale to vsphere
Merge pull request #332 from rightscale/ivory_14_15_acu156548_rename_vscale_to_vsphere

Rename vScale to vSphere