Fix for class load order issues
Fix for class load order issues

dbirchak/cartodb,splashblot/dronedb,nyimbi/cartodb,dbirchak/cartodb,CartoDB/cartodb,splashblot/dronedb,codeandtheory/cartodb,codeandtheory/cartodb,raquel-ucl/cartodb,nyimbi/cartodb,thorncp/cartodb,CartoDB/cartodb,future-analytics/cartodb,bloomberg/cartodb,bloomberg/cartodb,splashblot/dronedb,nyimbi/cartodb,nyimbi/cartodb,splashblot/dronedb,thorncp/cartodb,future-analytics/cartodb,codeandtheory/cartodb,CartoDB/cartodb,DigitalCoder/cartodb,bloomberg/cartodb,thorncp/cartodb,future-analytics/cartodb,UCL-ShippingGroup/cartodb-1,future-analytics/cartodb,thorncp/cartodb,DigitalCoder/cartodb,raquel-ucl/cartodb,future-analytics/cartodb,nuxcode/cartodb,bloomberg/cartodb,nuxcode/cartodb,raquel-ucl/cartodb,splashblot/dronedb,DigitalCoder/cartodb,nuxcode/cartodb,UCL-ShippingGroup/cartodb-1,nyimbi/cartodb,CartoDB/cartodb,UCL-ShippingGroup/cartodb-1,dbirchak/cartodb,UCL-ShippingGroup/cartodb-1,dbirchak/cartodb,bloomberg/cartodb,DigitalCoder/cartodb,codeandtheory/cartodb,nuxcode/cartodb,UCL-ShippingGroup/cartodb-1,codeandtheory/cartodb,nuxcode/cartodb,CartoDB/cartodb,raquel-ucl/cartodb,thorncp/cartodb,dbirchak/cartodb,DigitalCoder/cartodb,raquel-ucl/cartodb