Pull request #914: CAS-14526
Merge in CASA/casa6 from CAS-14526 to master
* commit '1fa240b0c662c34dbe52c7dfd47c45d2849b88bc':
changed the tolerance for test_wterm_awp2
adjusted some parameters and fixed a if condition that was not intended in last checkin.
correcting a merge oversampling increase and re-enabling wterm_awp2 test
Remove extra backtick CAS-14526 : Add warning about awphpg
fixed some tolerance and stop a test for now