Merge branch 'merge-4.2' into 'master'

src/epics/util/feCodeGen.pl

src/epics/util/lib/Filt.pm

src/epics/util/lib/IPCx.pm

src/fe/map.c

src/include/drv/cdsHardware.h

src/include/drv/gsc16ai64.c

src/include/drv/gsc16ao16.c

src/include/drv/gsc18ai32.c

src/include/drv/gsc18ai64.c

src/include/drv/gsc18ao8.c

src/include/drv/gsc20ao8.c

src/include/drv/iop_dac_functions.c