Synchronize keystone.conf template with Icehouse again

No real change this time.