Cherry-pick commits from master

dbffa3b was never cherry-picked from master, so creating PR w/ both cherry-picked commits.  I could have created a single PR simply deleting check_maas_plugins.py, but I'd rather keep things as clean as possible.