Add Image Source Field to choose Location or File

Change-Id: I79546c5c2d10b7d6cefdca084f4f7a13ce2939d5
Fixes: bug #1185671
Merge "Add Image Source Field to choose Location or File"
Fixed keystone test data to match openstack_auth.

Fixes bug 1207599

Change-Id: I2cc333911cc0d07cab9c0c550a8d0d69f374634c
Merge remote-tracking branch 'horizon/master' into auth-fix
Merge pull request #5 from tuskar/auth-fix

Auth fix