Find and select the machine token on drop

* New method to find a machine or container token given the machine's name
* Update call sites to select the machine/container token on creation.
* Tests.