Merge branch 'master' into L2SDP-253 and resolved merge conflicts

applications/lofar2/designs/.gitignore

...ications/lofar2/designs/lofar2_unb2b_ring_opencl/Makefile

...gns/lofar2_unb2b_ring_opencl/host/lib/common/inc/common.h

...signs/lofar2_unb2b_ring_opencl/host/lib/common/readme.css

...s/lofar2_unb2b_ring_opencl/host/lib/common/src/common.cpp

...lofar2/designs/lofar2_unb2b_ring_opencl/host/src/main.cpp

...ar2/designs/lofar2_unb2b_ring_opencl/lofar2_unb2b_ring.cl

...far2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml

..._unb2b_sdp_station/qsys_lofar2_unb2b_sdp_station_cpu_0.ip

...on/qsys_lofar2_unb2b_sdp_station_reg_stat_enable_bst_1.ip

...n/qsys_lofar2_unb2b_sdp_station_reg_stat_hdr_dat_bst_0.ip

...n/qsys_lofar2_unb2b_sdp_station_reg_stat_hdr_dat_bst_1.ip

..._station/qsys_lofar2_unb2b_sdp_station_rom_system_info.ip

...2b_sdp_station/quartus/qsys_lofar2_unb2b_sdp_station.qsys

...2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd

...b2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd

...dp_station/src/vhdl/qsys_lofar2_unb2b_sdp_station_pkg.vhd

applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd

...cations/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/board.qsys

...ons/ta2/bsp/hardware/lofar2_unb2b_ring_bsp/board_spec.xml