Build overhaul.  Commit to test with Jenkins.
Merge branch 'development' of https://github.com/infiniteautomation/ma-core-public.git into development