[FIXED JENKINS-20589] Kept previouls platform functionality in case TAP
stream isnt used or doesnt have platform information
Merge branch 'JENKINS-20589' into JENKINS-20624
Fixed tests