allow no_cdn for torque layers
Merge branch 'develop' into CDB-2959