Merge "Consolidate checking of superivsion configs." into tm-dev