Merge "Add contrail and virtlet parameters"