[engine] Fix bundle handling
Review Request #3860 - Created May 11, 2016 and submitted
|kwlzn, patricklaw, wisechengyi|
This broke during the merge flurry surrounding Kris' landing of the daemon, but wasn't covered by a test.
- Fix bundle handling.
- Confirm parsing of