Remove workaround from handlers init and wait
    
    Commit 98b1ac79 ensures the message is sent after data changes are
    committed into database. Hence, it is doable to remove these two
    workarounds.
    
    Signed-off-by: Chenxiong Qi <cqi@redhat.com>