Hi Robert,
Would you be able to provide an update to the code that needs to be commented out for version 2.0, in particular, the location of lines 88-101 in your example above. The code has changed a lot, is it potentially this?:
_getLayerInfoAndRelationshipLayerInfos: function(tr){
var def = new Deferred();
this.shelter.show();
var layerDef = this._getLayerInfo(tr);
layerDef.then(lang.hitch(this, function(layerInfo){
tr.layerInfo = layerInfo;
this._getRelationshipLayerInfos(tr).then(lang.hitch(this, function(relationshipLayerInfos){
if(!this.domNode){
return;
}
tr.relationshipLayerInfos = relationshipLayerInfos;
var relationshipPopupTemplates = {};
for(var layerId in relationshipLayerInfos){
var popupInfo = queryUtils.getDefaultPopupInfo(relationshipLayerInfos[layerId], false, true);
relationshipPopupTemplates[layerId] = new PopupTemplate(popupInfo);
}
this.shelter.hide();
def.resolve({
layerInfo: layerInfo,
relationshipLayerInfos: relationshipLayerInfos,
relationshipPopupTemplates: relationshipPopupTemplates
});
}), lang.hitch(this, function(err){
if(!this.domNode){
return;
}
this.shelter.hide();
def.reject(err);
}));
}), lang.hitch(this, function(err){
if(!this.domNode){
return;
}
this.shelter.hide();
def.reject(err);
}));
return def;
},
Thanks 
Carmel