[6.15.z] Add workaround for BZ:2255264 and extend for OS version check

[6.15.z] Add workaround for BZ:2255264 and extend for OS version check #4854