Ensure all variables are available in PXE generation (#505).
Merge pull request #1170 from jmaas/master

Ensure all variables are available in PXE generation (#505).