Remainaing xenial merges

This merges https://github.com/ubports/unity8/pull/443 and https://github.com/ubports/unity8/pull/444 from xenial and fixes #26 (closed).