Merge "Add manila.client system metadata"