Merge "Add fixed_key parameter under key_manager section in cinder conf"