updating to skip nb configuration files
 another change for goofy netbeans configs
NIFI-164: Fixed MockContentRepository that existed in a unit test
Merge branch 'NIFI164' into develop
Merge branch 'develop' into bootstrap