Fix no spaces before operator.
squelch E0611 under Python 2.x due to presence of Python 3 imports
squelch E0611 due to salt not being installed (per se) on/under Travis
squelch W0104 in test code where it's legit
squelch E0611 under Python 2.6 where collections.OrderedDict doesn't exist
squelch E1003 due to apparent pylint bug
squelch E1003 under Python 2.7 since OrderedDict in the std lib conflicts w/ the recipe version
squelch W0102 due to implementation trick in OrderedDict.__repr__()
squelch E0211 due to implementation trick in OrderedDict.update()
squelch E0102 due to legitimate progressive enhancement redefinitions of funcs
Return an empty dictionary instead of `ret` which is not yet defined at this stage.
Add missing import
Temporary directories should respect `integration.SYS_TMP_DIR`
Merge pull request #7018 from s0undt3ch/0.16-merge

Fix 0.16 lint errors