Synchronize keystone.conf template with Icehouse again

No real change this time.
Merge pull request #230 from vuntz/icehouse-conf

Synchronize keystone.conf template with Icehouse again