Merge r1875469 from trunk: Test exclsion doesn't work since "tag !~" matches when tag is undefined. Exclude tests from 2.4.x by explicitly matching against master. Will have to revisit this for 2.5.x.