Updated from openstack-manuals

Change-Id: I470eae8114cdc1e42ad96067dd55fd09e4d69658