Fix ManagementFactory compilation error, and bug #179.
Merge remote-tracking branch 'origin/master' into develop