Revert "Fix various noc files to be pep8 compliant"

Not merged on sockpuppet

This reverts commit 04a2fcb0d1c9068c15e43c1085d5d0f6a233bab5

Change-Id: I050ff93d18e3c466baf1029464c99d5d63c2152e
Merge "Revert "Fix various noc files to be pep8 compliant"" into production