Clean up wccnss from the remerge
Re-enable sec_debug for the traps driver