refs #7472. Remove old API imports.
Merge branch 'feature/7472_test_auxilary' into develop