Pre-Rebaseing from upstream

Merge commit '8d97a99152fe28b0799ae3a062bc8d65b8f53d7a'

* commit '8d97a99152fe28b0799ae3a062bc8d65b8f53d7a':
  fix a rare race condition
  avoid string concatenation in slf4j logs
  Support a prefix for secor data in zookeeper.

Conflicts:
	src/main/java/com/pinterest/secor/parser/PartitionFinalizer.java