3a17d9
Merge branch 'users/tzimmermann/SLE12-SP5/for-next' into SLE12-SP5 Resolve conflict in blacklist.conf