[openstack-packstack/el6-grizzly] (3 commits) ...Merge branch 'el6-grizzly'