Merge branch 'SLE12' into SLE12-SP1

suse-commit: fc1b7ca46c2c11453107c47640980ec3e817b813