Updates to core for new serotonin-utils
Merge branch 'master' of https://github.com/infiniteautomation/ma-core-public.git