Correct Guice circular dependency for Keystone 1.1

This commit reverts the parameter type to the same as d54c269.
Merge pull request #1435 from maginatics/keystone-1.1-circular-dependency

Correct Guice circular dependency for Keystone 1.1