Ensure NotImplemented is passed on in MaskedArray ufunc's
Add test cases to ensure NotImplemented is passed on
Small corrections to tests
Merge pull request #3904 from charris/backport-1.7-3900

Backport 1.7 3900