Merge branch 'packaging' into SLE12

suse-commit: 353c4ff9043087fff4d3544640bfff22b3ff1312