Merge branch 'nifi-maven-1.3.0-rc1'