Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
mark with @Transient if it is not going to be mapped to a JPA column