Fixes for gcp infra

Aliaksandr Ramanovich (EPAM)requested to merge
fixes into master

Some fixes, that won't be noticed during publishing

Merge request reports