BusDeploymentAspect does not clear BusFactory threadlocals before starting deployment

BusDeploymentAspect does not clear BusFactory threadlocals before starting deployment; the same way it clears everything in a final block at the end, it should clear everything at the beginning. The Spring additional context load internally relies on those thread locals for instance.