Merge "Cleans up exec workaround for ODL container clustering"