Merge "Introduce concept of DockUser" into tm-qpr-dev