Merge "Add hidden constants to allow the role holder updater to specify the failure strategy" into tm-dev