Revert "Probes: Fix failing nosetests"

This reverts commit 4f745cc2731f7035f02566ba8bc1a0e9ae1b1a71.

This breaks handling of unicode on python 2.
Probes: Fix unicode probe handling

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Probes: Disable builtin redefinition check

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
POSIX: Fix unicode file verification

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
POSIX: Fix pylint failure

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Merge remote branch 'upstream/maint' into maint