Merge branch 'v4.1.3rc' into grizzly

Conflicts:
	cookbooks/apache2
	cookbooks/apt
	cookbooks/aws
	cookbooks/ceilometer
	cookbooks/cinder
	cookbooks/collectd
	cookbooks/collectd-graphite
	cookbooks/collectd-plugins
	cookbooks/dsh
	cookbooks/exerstack
	cookbooks/glance
	cookbooks/graphite
	cookbooks/haproxy
	cookbooks/hardware
	cookbooks/horizon
	cookbooks/keepalived
	cookbooks/keystone
	cookbooks/kong
	cookbooks/memcached
	cookbooks/memcached-openstack
	cookbooks/modules
	cookbooks/monit
	cookbooks/monitoring
	cookbooks/mysql
	cookbooks/mysql-openstack
	cookbooks/nova
	cookbooks/nova-network
	cookbooks/ntp
	cookbooks/openssh
	cookbooks/openstack-ha
	cookbooks/openstack-logging
	cookbooks/openstack-monitoring
	cookbooks/osops-utils
	cookbooks/postgresql
	cookbooks/rabbitmq-openstack
	cookbooks/rsyslog
	cookbooks/runit
	cookbooks/sosreport
	cookbooks/swift
	cookbooks/sysctl
	cookbooks/tempest