Merge branch 'master' into sprint-1.7.1

* also added result count to search results

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmct",
-  "version": "1.6.3-SNAPSHOT",
+  "version": "1.7.1-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {},
   "devDependencies": {

src/plugins/notebook/components/Notebook.vue

@@ -430,7 +430,7 @@ export default {
                     }
 
                     // check for no entries first
-                    if (entries[section.id]) {
+                    if (entries[section.id] && entries[section.id][page.id]) {
                         const pageEntries = entries[section.id][page.id];
 
                         pageEntries.forEach(entry => {

src/plugins/notebook/components/SearchResults.vue

@@ -22,7 +22,7 @@
 
 <template>
 <div class="c-notebook__search-results">
-    <div class="c-notebook__search-results__header">Search Results</div>
+    <div class="c-notebook__search-results__header">Search Results ({{ results.length }})</div>
     <div class="c-notebook__entries">
         <NotebookEntry v-for="(result, index) in results"
                        :key="index"