Github user ijokarumawak commented on the issue:
I have rebased your PR against the latest master and fixed the unit test
failures. And created another PR based on yours. Would you take a look on this?
#2618 Would you close this one if it looks to you to make a single combined PR?
@mattyb149 It'd be appreciated if you can take a look on #2618, too. Since
it has updates related to what you've done with #2504 NIFI-4773. Thanks!