2.9 compatibility changes for recent master commits

Conflicts:
	src/test/scala/org/ensime/test/SwankProtocolSpec.scala