Merge "Update docker user for osmclient"