Merge over and resolve conflicts release->dev

lib/galaxy/tools/__init__.py

@@ -2611,7 +2611,7 @@ class Tool( object, Dictifiable ):
         hdca_source_dict = {}
         for hdca in history.dataset_collections:
             key = '%s_%s' % (hdca.hid, hdca.collection.id)
-            hdca_source_dict[ hda.collection.id ] = hdca_source_dict[ key ] = hdca
+            hdca_source_dict[ hdca.collection.id ] = hdca_source_dict[ key ] = hdca
 
         # Map dataset or collection to current history
         def map_to_history(value):

tools/genomespace/genomespace_exporter.xml

@@ -50,4 +50,4 @@ If you are having trouble with this tool, click here_ to refresh your GenomeSpac
     </help>
     <options refresh="True"/>
     <code file="genomespace_exporter.py" />
-</tool>
+</tool>