Removed complex conditions since they will never occur in this case. Removed mention of par and parok since only fpar is used. Cleaned up some spacing. Unwrap phase pol uses polid 0 and 1 now before they were set to polId which would lead both to have an id of 1
Pull request #796: CAS-14262
Merge in CASA/casa6 from CAS-14262 to master
* commit 'ca46cb7299504b19145e91bc41c8ffcd3e16e1be':
Revert Force Failure
Update to xmlrunner converter
Force Test Failures to test parser failure conditions
Update to generate base xml if expected one is not written
Add Update to parse fail and skip tests correctly
Test Converted for use with xmlrunner module
