Fix tag inclusion/exclusion options not working if '-x' is also specified

This happened because XmlTestSuiteMixin.run_suite doesn't call super.run_suite, so TagTestSuiteMixin.run_suite wasn't being called if it was being wrapped by xml_wrap.

Fixed by changing the order of the wrapping, so now tag_wrap wraps the result of xml_wrap instead of the other way round.