move waffle to diff endpoint, don't block on waffle/consumer-info after first run (bug 1079681)