Merge "add diag_status to ha_proxy"