take advantage of better boot step error handling
Merge bug25693
stable to default