Merge "Include the history tag string in checkin file verbatim" into udc-qpr-dev