Select containers when units are placed on them

Fixes bug #1367423 where container tokens were deselected when units were added to them.
Can we change this to selectedContainerId throughout? It gets confusing when we use container to refer to both the actual machine or the ID of it.