Merge "Fix consul agent start problems"