use keystone service port instead of admin port

Change-Id: Iaf1848ecabf100171f741fde0efee5d8f65b7795
Fixes: Bug #1214921
Merge "use keystone service port instead of admin port"