Merge remote-tracking branch 'upstream/release_17.01' into dev

client/galaxy/scripts/mvc/workflow/workflow-terminals.js

@@ -428,9 +428,11 @@ define(['mvc/workflow/workflow-globals'], function( Globals ) {
             if( ! canMatch ) {
                 for( var collectionTypeIndex in collectionTypes ) {
                     var collectionType = collectionTypes[collectionTypeIndex];
-                    var effectiveMapOver = otherCollectionType.effectiveMapOver( collectionType );
-                    if( effectiveMapOver != NULL_COLLECTION_TYPE_DESCRIPTION ) {
-                        return effectiveMapOver;
+                    if( otherCollectionType.canMapOver( collectionType ) ) {
+                        var effectiveMapOver = otherCollectionType.effectiveMapOver( collectionType );
+                        if( effectiveMapOver != NULL_COLLECTION_TYPE_DESCRIPTION ) {
+                            return effectiveMapOver;
+                        }
                     }
                 }
             }

lib/galaxy/tools/__init__.py

@@ -114,12 +114,13 @@ GALAXY_LIB_TOOLS_UNVERSIONED = [
     "GeneBed_Maf_Fasta2",
     "maf_stats1",
     "Interval2Maf1",
+    "Interval2Maf_pairwise1",
     "MAF_To_Interval1",
     "MAF_filter",
     "MAF_To_Fasta1",
     "MAF_Reverse_Complement_1",
     "MAF_split_blocks_by_species1",
-    "maf_limit_size1",
+    "MAF_Limit_To_Species1",
     "maf_by_block_number1",
     "wiggle2simple1",
     # Converters