[Differential] [Updated] D1944: PF and VIMAGE fixes

[rodrigc (Craig Rodrigues)]

rodrigc added reviewers: bz, zec, trociny.

REVISION DETAIL
  https://reviews.freebsd.org/D1944

To: nvass-gmx.com, glebius, rodrigc, gnn, bz, zec, trociny
Cc: freebsd-virtualization, freebsd-pf, freebsd-net