Merging SLE-12-GA with the cherry-picked changes back into master

And increasing the version, to release the update into tumbleweed.