Use options-1.2-SNAPSHOT until it propagates.
More dumbness in my socket fixes.
Use options-1.2-SNAPSHOT until it propagates.

Conflicts:
	core/pom.xml
Merge remote-tracking branch 'origin/jruby-1_7'

Conflicts:
	core/pom.xml