Github user bbende commented on the issue:
https://github.com/apache/nifi/pull/2561
I would try doing a rebase against master to see what happens. In the worst
case situation you would have to create another branch off latest master, and
then individually cherry-pick your commits from this branch over to the new
branch, to get rid of those other commits that are in between yours, but only
do that if you can't get this branch straightened out. ---
