[openstack-packstack/el6-grizzly: 3/3] Merge branch 'el6-grizzly'