initial merge from Junipor Contrail repo