Allow use of non platform MBeanServer
Merge branch 'master' of
https://sfdc-hhildebrand@github.com/sfdc-hhildebrand/Army-Of-Darkness.git

Conflicts:
	zombie/src/main/java/com/salesforce/aod/zombie/simple/Configuration.java