Merge "port updates to ueb-listener.properties to OOM"