Filter units by machine including sub-containers.

QA: 
You should not see differences in the machine view between this branch and trunk.