[PATCH rhel6-branch] Add support for vlan id in iBFT (#831002)