Merge "Add keystoneng support"