Merge develop to master, end-of-sprint 2017.12 (@...

Merge develop to master, end-of-sprint 2017.12 (@ smrtlink-incremental_5_0_0_snapshot5950, RBS-DEVSMRTLINKINC-765)

src/ChemistryTable.cpp

@@ -89,8 +89,8 @@ extern const ChemistryTable BuiltInChemistryTable = {
     {{"100-862-200", "101-093-700", "4.1", "S/P2-C2"}},
 
     // 5.0 ("Iguana"); S/P2-C2
-    {{"100-862-200", "100-861-800", "5.0", "S/P2-C2"}},
-    {{"100-862-200", "101-093-700", "5.0", "S/P2-C2"}}
+    {{"100-862-200", "100-861-800", "5.0", "S/P2-C2/5.0"}},
+    {{"100-862-200", "101-093-700", "5.0", "S/P2-C2/5.0"}}
 
 };