Support for more comprehensive harvesting mode vs binary safe-mode.

https://bugs.launchpad.net/juju-core/+bug/1345553
Test corrected.