Cleanup some of the flow when doing gptid parsing
Merge branch 'master' of github.com:pcbsd/pcbsd