Sync 331

Thanks @mseaton!
@cioan , there is an intellij setting to tweak this (I think the default is to change to .* if there are 8 or more classes in the same package, but @djazayeri  often comments that this is against the OpenMRS coding standards, so this should be fixed to not use wildcard imports.