Async bug work-around

1. Sortie clean-up code of framework.
2. Work-around to avoid issue of XAPI time out on specific async call.

Signed-off-by: Jun Wook Kwak junwook.kwak@citrix.com
Reviewed-by: Rob Dobson rob.dobson@citrix.com