build+ci: Fixing compilation and CI scripts

Change-Id: If3c5fe06f19b5aaddc1ee8c7b73b2b3de4c45892
Refs: #2288