Use UTC for discipline incident date/time generation
Merge branch 'master' into java-upgrade