This is already part of https://github.com/crowbar/barclamp-keystone/pull/138