Merge "Allow ROLE_HOME to use FLAG_SLIPPERY" into tm-dev