clean up SpringObjectBuilder
make SpringObjectBuilder.context instance based

fixes #1387