Reviewed-by: darcy, weijun
Reviewed-by: tbell
Fixed a deadlock between the two class loaders Reviewed-by: alanb