Changed Trapd executor call to be async again since the
WaterfallExecutor call is synchronous. This restores performance in
processing incoming traps.
Merge branch '1.12'