Updated from openstack-manuals

Change-Id: Iced39eef097af151bf43b6bc6cc93a0b86d23a64