Fix PHPCS
Add $om to list of acceptable shortnames
Merge branch 'master' into PIM-2185