Cherry pick from https://review.openstack.org/#/c/38375

Fixes to install guide and basic install guide.

Fix bug 1199133

Change-Id: I413251be6c1b1204fb76d8daa8d0218854a1ceca
Merge "Cherry pick from https://review.openstack.org/#/c/38375" into stable/grizzly