Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
no inline KcServiceLocator.  Please do the following for classes that aren't spring managed beans:
```
private DataDictionaryService dataDictionaryService;

public void setDataDictionaryService(DataDictionaryService dataDictionaryService) {
    this.dataDictionaryService = dataDictionaryService;
} 

public DataDictionaryService getDataDictionaryService() {
    if (this.dataDictionaryService == null) {
        this.dataDictionaryService = KcServiceLocator.getService(DataDictionaryService.class);
    }
    return this.dataDictionaryService; 
}
```

Then refer to the getter everywhere you are using the KcServiceLocator