Merge branch 'release_16.01' into dev

Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map

client/galaxy/scripts/mvc/ui/popup-menu.js

@@ -120,7 +120,7 @@ var PopupMenu = Backbone.View.extend({
         // function to close popup and unbind itself
         function closePopup( event ){
             $( document ).off( 'click.close_popup' );
-            if( window.parent !== window ){
+            if( window && window.parent !== window ){
                 try {
                     $( window.parent.document ).off( "click.close_popup" );
                 } catch( err ){}
@@ -133,7 +133,7 @@ var PopupMenu = Backbone.View.extend({
         }
 
         $( 'html' ).one( "click.close_popup", closePopup );
-        if( window.parent !== window ){
+        if( window && window.parent !== window ){
             try {
                 $( window.parent.document ).find( 'html' ).one( "click.close_popup", closePopup );
             } catch( err ){}

lib/galaxy/config.py

@@ -262,9 +262,7 @@ def __init__( self, **kwargs ):
         self.log_events = string_as_bool( kwargs.get( 'log_events', 'False' ) )
         self.sanitize_all_html = string_as_bool( kwargs.get( 'sanitize_all_html', True ) )
         self.sanitize_whitelist_file = resolve_path( kwargs.get( 'sanitize_whitelist_file', "config/sanitize_whitelist.txt" ), self.root )
-        self.sanitize_whitelist = []
-        if kwargs.get('sanitize_whitelist_file', None) is not None:
-            self.reload_sanitize_whitelist()
+        self.reload_sanitize_whitelist()
         self.serve_xss_vulnerable_mimetypes = string_as_bool( kwargs.get( 'serve_xss_vulnerable_mimetypes', False ) )
         self.allowed_origin_hostnames = self._parse_allowed_origin_hostnames( kwargs )
         self.trust_ipython_notebook_conversion = string_as_bool( kwargs.get( 'trust_ipython_notebook_conversion', False ) )

lib/tool_shed/util/encoding_util.py

@@ -3,7 +3,6 @@
 import logging
 
 from galaxy.util.hash_util import hmac_new
-from galaxy.util.json import json_fix
 
 log = logging.getLogger( __name__ )
 
@@ -21,13 +20,8 @@ def tool_shed_decode( value ):
     values = None
     try:
         values = json.loads( value )
-    except Exception, e:
+    except Exception:
         pass
-    if values is not None:
-        try:
-            return json_fix( values )
-        except Exception, e:
-            log.debug( "Fixing decoded json values '%s' from tool shed threw exception: %s" % ( str( values ), str( e ) ) )
     if values is None:
         values = value
     return values