Revert "Revert "Merge branch 'stable/havana' of https://github.com/townbull/keystone into stable/havana""

This reverts commit 5ea6e732908c6137345578ccca104117fe27ca9a.