Merge from SailfishOS branch.

Plus a few adjustments
Jolla Harbour release version bump