Merge commit mad-hatter

* commit '8cec59e6c':
  MB-40543: Add dynamic blacklist FTS log config option

Merged via --strategy=ours - FTS blacklisting is no longer present in
master as underyling FTS bug has been fixed.

Change-Id: Ic8e09a9b4f6646bfe17382b33200741958361568

Author: daverigby