Merge "Add metadata for credential key rsync rotate"