Revert check_supervisor() changes, use riemann-client 5 and psutil 1.2.0

Base WIP version for 3.0.0-dev