Porting bug fixes 1367208, 1374282 from R1.20 to R1.30.
Fix bug 1367208
	neutronclient >= 2.3.7 requires public_endpoint and admin_endpoint in the keystone.conf,
	if not defaults to localhost.

Fix bug 1374282
Using CONTROLLER instead of locahost for glance and cinder endpoints.

Change-Id: I82d6f242161d7c25a8430826bbe01739370bbbc7