Updated from openstack-manuals

Change-Id: Icd24be18ab2f19553a8f3be9bd5a187d6f182196