Updated from openstack-manuals

Change-Id: I1455ab3cc9ef028b1522babbc97f6ad9514fe6d6