Hide additional blacklist separator

When there is no blacklist func enabled we dont need
2 separators at the end of row

Change-Id: Ieef2d2b5f553c2b4dd48ae528e7a0de185f4b2ad
Merge remote-tracking branch 'cm/cm-10.1' into HEAD