Reinstate the 1.18 compatability for AddMachines.
Merge pull request #838 from howbazaar/fix-1.18-add-machine

Reinstate the 1.18 compatibility for AddMachines.

Fixes https://bugs.launchpad.net/juju-core/+bug/1373424