Clean up zombie.
Merge branch 'master' of https://sfdc-hhildebrand@github.com/sfdc-hhildebrand/Army-Of-Darkness.git
Fix broken test, remove mxbean tests