Merge branch 'L2SDP-962' into 'master'

...ons/lofar2/libraries/sdp/src/vhdl/node_sdp_correlator.vhd

...s/lofar2/libraries/sdp/src/vhdl/sdp_beamformer_output.vhd

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

libraries/base/dp/hdllib.cfg

libraries/base/dp/src/vhdl/dp_add_flow_control.vhd

libraries/base/dp/src/vhdl/dp_packet_merge.vhd

libraries/base/dp/src/vhdl/dp_packet_unmerge.vhd

libraries/base/dp/tb/vhdl/tb_dp_packet_merge.vhd

libraries/base/dp/tb/vhdl/tb_dp_packet_merge_unmerge.vhd

libraries/base/dp/tb/vhdl/tb_tb_dp_packet_merge.vhd

libraries/base/dp/tb/vhdl/tb_tb_dp_packet_merge_unmerge.vhd