Merge "add ability to run without discovery in contrail 3.x"