Merge pull request #1108 in CASA/casa from hf-drs27 to master
* commit 'c89539f8b17cba1696d023dc96e262b408e13cce':
spwmap parameter of calibration routines is a list of (various length) lists
Merge pull request #1106 in CASA/casa from CAS-12666 to master
* commit '3240a9cc9038377b8baf2e41627f7e8948e65cc0':
Changed the pylab import back to what it was originally
Changed import for task_polfromgain.py to work in Casa 5 and 6