Updated from openstack-manuals

Change-Id: I90bb911eda7ec7fffad65a3087ddf0bc0cfb0a27