Delete block white/black lists. CAF-276
Merge pull request #3998 from mmascher/consistent-CAF-276

Delete block white/black lists. CAF-276