Restore logging around blobstore upload
Remove buildpack cache and app package from blobstore in background
Auto-merge remote-tracking branch 'upstream/master'