diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index cb59c13c01..c0f3583294 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -29,8 +29,8 @@
     <description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
     <url>http://nifi.incubator.apache.org/maven-site/</url>
     <organization>
-        <name>Apache NiFi (incubating) Project</name>
-        <url>http://nifi.incubating.apache.org/</url>
+        <name>Apache NiFi (incubating)</name>
+        <url>http://nifi.incubator.apache.org/</url>
     </organization>
     <licenses>
         <license>
@@ -208,6 +208,7 @@
                     <excludes>
                         <exclude>nb-configuration.xml</exclude>
                         <exclude>nbactions.xml</exclude>
+                        <exclude>DEPENDENCIES</exclude>
                     </excludes>
                 </configuration>
             </plugin>
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index dbc4b3c6f3..2a68016d2c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@ -1175,13 +1175,19 @@ public class ControllerFacade implements ControllerServiceProvider {
 
         for (final Map.Entry<PropertyDescriptor, String> entry : procNode.getProperties().entrySet()) {
             final PropertyDescriptor descriptor = entry.getKey();
+            
+            addIfAppropriate(searchStr, descriptor.getName(), "Property", matches);
+            addIfAppropriate(searchStr, descriptor.getDescription(), "Property", matches);
+            
+            // never include sensitive properties values in search results
+            if (descriptor.isSensitive()) {
+                continue;
+            }
+            
             final String value = entry.getValue();
             if (StringUtils.containsIgnoreCase(value, searchStr)) {
                 matches.add("Property: " + descriptor.getName() + " - " + value);
             }
-
-            addIfAppropriate(searchStr, descriptor.getName(), "Property", matches);
-            addIfAppropriate(searchStr, descriptor.getDescription(), "Property", matches);
         }
 
         // consider searching the processor directly
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 6742395982..d0a7a98699 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -28,8 +28,8 @@
     <description>Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator.</description>
     <url>http://nifi.incubator.apache.org/maven-site/</url>
     <organization>
-        <name>Apache NiFi (incubating) Project</name>
-        <url>http://nifi.incubating.apache.org/</url>
+        <name>Apache NiFi (incubating)</name>
+        <url>http://nifi.incubator.apache.org/</url>
     </organization>
     <licenses>
         <license>
@@ -967,6 +967,7 @@
                         <exclude>src/test/resources/</exclude> <!-- Test datasets -->
                         <exclude>nb-configuration.xml</exclude>
                         <exclude>nbactions.xml</exclude>
+                        <exclude>DEPENDENCIES</exclude>
                     </excludes>
                 </configuration>
             </plugin>