Merge branch '7.x-2.x' into 7.x-2.x-dev

# By Melissa Anez (20) and others
# Via Daniel Lamb (5) and others
* 7.x-2.x: (62 commits)
  Incorporating last bit of feedback from @daniel-dgi. IT WORKS.
  Add try/catch.
  Remove piping to Karaf, and fix indexing.triplestore.cfg sed.
  No. Fuseki. NO.
  Missed a couple more 2.16.0 requirements for camel.
  Added required title prefix for incoming pull requests that correspond to issues.
  Fixed some grammar issues.
  more camel version updating
  Fix path, and change camel version.
  Use fcrepo-camel-toolbox in Karaf.
  Break these out into separate files.
  Address MkDocs warnings, and clean up formatting. Address #117
  Path fixes.
  Using prerequisite attribute on dependent features.
  Update 2xfor1x.md
  Update 2xfor1x.md
  Update 2xfor1x.md
  Update 2xfor1x.md
  Changing image service exports and the watch script.
  Update 2xfor1x.md
  ...

islandora_collection/islandora_collection.module

@@ -26,7 +26,7 @@ function islandora_collection_node_info() {
     ISLANDORA_COLLECTION_CONTENT_TYPE => array(
       'name' => t("Collection"),
       'base' => ISLANDORA_COLLECTION_CONTENT_TYPE,
-      'description' => t("A Drupal node modeling an pcdm:Collection."),
+      'description' => t("A Drupal node modeling a pcdm:Collection."),
     ),
   );
 }