Add charm and bundle contents to the blob store.

Also, better at the end, so it's not the first thing you see when looking at the file.