Configurable rundir, repuppet fix with 3.3.0, remove default waitforcert