Merge "Add nova service user metadata" into release/2019.2.0