Merge sle 12

Yes, or I would simply omit it. The lineage is in git history, and changelog analysis uses at most bnc numbers.