bnd: bnd file had both Include-Resources and -includeresources

You apparently cannot have both. This caused the bnd jar to not contain
embedded-repo.jar which is a very bad thing.
dogfood: Need to use older, good bnd to build bnd

Since build 346 is bad, we cannot use it to build the fixe bnd. So we use
the last known good build (temporarily).
dogfood: Use latest bnd build since we have fixed the fatal error

Revert "dogfood: Need to use older, good bnd to build bnd"

This reverts commit a0bb9caf5dffc128d9eb601d22a300f95bd43327.