Merge "Fix logic for ipflush_onchange and restart_on_ipflush" into release/2019.2.0