Add BaseWaiterFactory, so we can start splitting the waiters

Add BaseWaiterFactory, so we can start splitting the waiters #3064