Merge "Fixing robo test compilation" into ub-launcher3-master