CMS-1071 Convert @Autowired to @Inject in code