Kfscntrb 846

The changes I want to merge into development can be seen here: https://github.com/ua-eas/katt-kfs-release-5-3/commit/a8c7033fe9c6dd50b748ed9dc3bb45df785c7819

I think it is treating the merge of this feature branch into master on May 29 as all new, which is why this pull request is a mess.