Set NetBootImage when Enabling

Fix bug that did not properly set the NetBoot image when enabling
NetBoot.
Merge branch 'bug-netBootNBI'