Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2517
@JohannesDaniel just do a rebase against master. You shouldn't use `git
merge master` for something like this. If you want to do a big squash event to
make the rebase easier, go ahead.---
