Ensure tests pass on raet and zmq
Merge pull request #14300 from pass-by-value/more_matcher_test_fixes

Ensure tests pass on raet and zmq
Merge branch '2014.7' into develop
Merge pull request #14321 from thatch45/develop

forward merge #14300