Merge "Fix a couple shell unit test regressions" into tm-qpr-dev