Update to work with latest version of stable/folsom keystone