Merge pull request #314 from rackerjoe/sprint20

Sprint20 merge
Merge pull request #325 from rcbops/sprint

End of Sprint Merge
Auto Updating hardware submodule
Auto Updating collectd-plugins submodule
Auto Updating collectd-graphite submodule
Auto Updating monit submodule
Auto Updating osops-utils submodule
Auto Updating keepalived submodule
Auto Updating haproxy submodule
Auto Updating monitoring submodule
Auto Updating sysctl submodule
Auto Updating swift submodule
Auto Updating nova-network submodule
Auto Updating dsh submodule
Auto Updating cinder submodule
Auto Updating kong submodule
Auto Updating rabbitmq-openstack submodule
Auto Updating keystone submodule
Auto Updating collectd submodule
Auto Updating sosreport submodule