Changed mongo query to use new machineid
Merge pull request #991 from perrito666/fix_1387172

Changed mongo query to use new machineid

This fixes https://bugs.launchpad.net/juju-core/+bug/1387172 which is caused by the changes to machine _id