Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
Oh we shouldn't be doing that now. I did this because it was in an overlay and overlaying some resource files cause issues. These differences should be merged into repository-award.xml.