fix deprecated catalog driver

In Icehouse
keystone.catalog.backends.templated.TemplatedCatalog
is deprecated in favor of
keystone.catalog.backends.templated.Catalog

Change-Id: I2e026cb0361b6ceeae801d9b434188a71a12e23a
Merge git://github.com/puppetlabs/puppetlabs-keystone