[PLAT-3602] removed dependence on junit (switched to TestNG)
Merge branch 'develop' of http://github.com/OpenGamma/OG-Platform into develop