Fix tracebacks from out of scope
Merge branch 'zenoss' into develop