Pull request #634: CAS-13920
Merge in CASA/casa6 from CAS-13920 to master
* commit 'c9e94872ba754e035b05bc1f14c8af95ae6ba4c9': CAS-13920 : Edited the test to correctly set the mpicasa vs casa check. CAS-13920 : edited test, to follow documentation for serial vs parallel return dict. CAS-13920 : Fixed stopcode indexing bug. Added return dir 'iterdone' and 'stopcode' check to the test_iterbot_nmajor_2 test case.
Revert "CAS-6692 added memory and runtime profile for deconvolvers in minor cycle" Also, resolved conflicts, to keep changes from later than this commit, where needed. This reverts commit 063ec591e6db766059e8796d26562cd61f2511d7.
Revert "CAS-6692 always check for peak memory usage during deconvolution immediately before exiting"