Set SERVICE_PROTOCOL in keystone

This was incorrectly not being used in the devstack case and is needed
in grenade before the fix can be made in devstack.

Change-Id: Ia7533e41bc4fdf932a9d565a20b7e1c1107f37c3
Merge "Set SERVICE_PROTOCOL in keystone"