Merge in CASA/casa6 from CAS-13714 to master
* commit '9bd7a74d61dfcdb3638178e26880df518f04c9be':
This commit is unrelated to the changes on this branch. They are changes needed for the verification tests when running tests that are not in the casatasks/tests/tasks/ path. I also sorted again some of the entries in the json file that were out of place.
Removed unused function prepinputmask.
Removed casa5-related code from the tests.