Update for HAProxy 1.5, and clean-up templates