197145
Merge remote-tracking branch 'origin/users/oneukum/SLE12-SP4/for-next' into SLE12-SP4 Pull more config updates from Oliver Neukum