Fixed bugs in 5.1 meta-data support; added greater tolerance for VM transitions during vApp capture