ac805c
Merge branch 'users/ppavlu/SLE12-SP5/for-next' into SLE12-SP5 Fix merge conflict in blacklist.conf