refs #7319. Remove imports from inside package init instead.
Merge branch 'feature/7319_l2q_testing' into develop