Merge commit 'refs/changes/97/97/1' of ssh://review.openstack.netapp.com:29418/NetApp/openstack-deploy-ops-guide into HEAD