Merge branch 'wsclean-integration-fixes' into 'master'

Minor fix in everybeam primarybeam calculation

See merge request !63