Filter units by machine including sub-containers.
Merge pull request #302 from frankban/more-binding

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