Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev