Service filtering is once again working.

- Reordered filtering to consider units first. This drives all other filtering.
- Included service filtering tests once more.
- Change in behavior: machines which are not filtered will now list all their subordinates.
- https://bugs.launchpad.net/juju-core/+bug/1385456