[450196] Eliminate Complete OCL import asymmetry
[450196] - Tidying up the namespace ref computation