Merge "Add backup functionality for keystone credentials"