Remove the usage of defaults in dunit & piggy back on .dunitconfig.dist for defaults