RTSD-79, fixed merge conflicts 2

applications/lofar1/RSP/pfb2/src/vhdl/pfb2_unit.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_combine.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_fir.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_coefsbuf.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_ctrl.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_mac.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_fir_tapsbuf.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_pkg.vhd

applications/lofar1/RSP/pfs/src/vhdl/pfs_rotate.vhd

applications/lofar1/RSP/pfs/tb/vhdl/tb_pfs.vhd

applications/lofar1/RSP/pft2/src/vhdl/pft_bf.vhd

applications/lofar1/RSP/pft2/src/vhdl/pft_bf_fw.vhd

applications/lofar1/RSP/pft2/src/vhdl/pft_lfsr.vhd

applications/lofar1/RSP/pft2/src/vhdl/pft_pkg.vhd

applications/lofar1/RSP/pft2/src/vhdl/pft_separate.vhd

applications/lofar1/RSP/pft2/src/vhdl/pft_top.vhd

applications/lofar1/RSP/pft2/src/vhdl/pft_unswitch.vhd

applications/lofar1/RSP/pft2/tb/vhdl/tb_pft2.vhd

...far2_unb2b_adc_6ch_200MHz/lofar2_unb2b_adc_6ch_200MHz.vhd