Merge pull request #283 from jk-ozlabs/petitboot-fixes

Petitboot fixes