Updated from openstack-manuals

Change-Id: Ife37d7fcf79fb355df05c71a49a8f0b80b41ce81