fixing tcms uuid-s; more e2e enabled
Merge branch 'tcms' into sat-6.0