Merge branch 'nifi-maven-1.3.1-rc1'