bug fixes from pylint cleanup
Merge branch 'pylint_debug_session_1' into development