[C++] Allow for tests to resolve to different addresses in the canonical form.  Use regular expression to match in the test.  Use more specific mask to make test more accurate.
[C++] Allow for tests to resolve to different addresses in the canonical form.  Use regular expression to match in the test.  Use more specific mask to make test more accurate.

mikeb01/Aeron,mikeb01/Aeron,mikeb01/Aeron,mikeb01/Aeron