Merge "CamreaITS: several ITS tests tweak" into lmp-mr1-dev