Merge "Fix for situation when haproxy has nothing for listen to"