Add back in internal updates

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
Add local_updates param to event_wait

This is so it can be used with the two different updates objects

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
Merge pull request #1803 from jonludlam/fix_bvt_blocker

[XS64BIT] Fix bvt blocker