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

Fixes to install guide and basic install guide.
Fix bug 1199133

Change-Id: I2ff4cd28a7984a47c75de38f0f54c3eeb8a49f19