Merge branch 'master' into ivory_14_07_acu161304_ubuntu_14.04
migrate: Supply virt type flag to ec2-register for HVM (acu169018)
Create cloudstack_uploader tool (acu131763)
acu161304 Pin collectd to previous version

Collectd5 causes serious issues with the sketchy servers so by default
force the old version.
Ubuntu 14.04 support (WIP)
Merge branch 'ivory_14_07_acu161304_ubuntu_14.04' into ivory_14_13_acu161304_trusty
acu161304 Have rightlink be more responsible for maintaining the motd
acu161304 Remove use of floppy on vSphere, its throwing errors
RHEL7 support (acu161304)
Add UsePrivilegeSeparation sandbox for OpenSSH 6.1+ (w-6279) (acu161304)
acu161304 Bump changelog and version
acu161304 Merge branch 'ivory_14_07_acu161304_ubuntu_14.04' into ivory_14_12_acu161304_ubuntu_trusty_remix

* ivory_14_07_acu161304_ubuntu_14.04:
  Ubuntu 14.04 support (WIP)
Merge branch 'ivory_14_12_acu161304_ubuntu_trusty_remix' into ivory_14_13_acu161304_trusty
acu161304 Remove stray floppy metadata drive variable
Epel shouldn't be configured on RHEL (acu161304)
[ubuntu] Pin to collectd4 (acu161304)
acu161304 Fix for ros_upload on CentOS 6
xen_blkfront.sda_is_xvda=1 not needed on CentOS 6.5+ (acu161304)
Use s3_base_url to download rightimage tools (acu131763)
Merge pull request #161 from rightscale/ivory_14_13_acu131763_cloudstack_uploader_tool

Create cloudstack_uploader tool (acu131763)