Updated from openstack-manuals

Change-Id: I1b313bcf34e015587afab5b82dfa1172690827e9