Merge "Merge "Remove "force user set on upgrade" setting" into tm-dev am: bcb47eb6 am: 93b004ca" into tm-qpr-dev