fixating commonservicelocator dependency as well