Merge "Add backup functionality for keystone credentials" into release/proposed/2019.2.0