Fixes to snap build

Giovanni Panozzo requested to merge snapfixes into master

Please select the right template in the above drop down box.

Merge request reports