Merge "Created new class KeystoneException"