Updated from openstack-manuals

Change-Id: I04d693b4eb9d76b59721526303632f13a7f56c66