Re-register our beans if we have to restart agent on failed exec.
Merge remote-tracking branch 'origin/jruby-1_7'

Conflicts:
	core/src/main/java/org/jruby/Ruby.java