Github user mattyb149 commented on the issue:
https://github.com/apache/nifi/pull/1589
For furture reference, rather than merging master into your branch, I find
it helpful to checkout master, pull the latest from upstream, then checkout
your branch and rebase against master. There won't be any merge commits and
things will look cleaner.---
