Move ServiceLocator from zanata-model to zanata-war to make functional tests happy