Updated from openstack-manuals

Change-Id: I86be069273ae3fbb5aad03fa3d9e43b3100180ed