RTSD-79, fixed merge conflicts

libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd

libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd

libraries/io/eth/hdllib.cfg

libraries/io/eth/src/vhdl/eth_tester_axi4_wrapper.vhd

libraries/technology/fifo/hdllib.cfg

libraries/technology/fifo/tech_fifo_component_pkg.vhd

libraries/technology/fifo/tech_fifo_dc.vhd

libraries/technology/fifo/tech_fifo_dc_mixed_widths.vhd

libraries/technology/fifo/tech_fifo_sc.vhd

libraries/technology/ip_ultrascale/fifo/hdllib.cfg

...s/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_dc.vhd

...ip_ultrascale/fifo/ip_ultrascale_fifo_dc_mixed_widths.vhd

...s/technology/ip_ultrascale/fifo/ip_ultrascale_fifo_sc.vhd

libraries/technology/ip_ultrascale/ram/hdllib.cfg

.../technology/ip_ultrascale/ram/ip_ultrascale_ram_cr_cw.vhd

...echnology/ip_ultrascale/ram/ip_ultrascale_ram_crw_crw.vhd

libraries/technology/memory/hdllib.cfg

libraries/technology/memory/tech_memory_component_pkg.vhd

libraries/technology/memory/tech_memory_ram_cr_cw.vhd

libraries/technology/memory/tech_memory_ram_crw_crw.vhd