HK2-179 Fix testng to give individual test classes their own ServiceLocator
by default, but even if two test classes choose the same name ensure that
they do not double-populate the ServiceLocator