Bugfixes in OCCI plugin and add keystone support