Updated from openstack-manuals

Change-Id: Id75c8245cdf7e78417a01ed9f2d1a6ab51608ed7