Added parsing of gift wrap rolls, and pushed gift wrap and FQ bundle changes to xpi