Fix for missing BuildID XML node in FVDL and FPR files