Merge "Add haproxy to list of applications" into release/proposed/2019.2.0