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

Change-Id: I0a7349bc670d2c859d0abe55752fe70da8207ec3
Merge "Fix bug 1374282 	Using CONTROLLER instead of locahost for glance and cinder endpoints." into R1.10