Merge pylint/pychecker cleanups from branch master of trinity