Fix Lift dependencies for earlier builds.
Merge branch '2.0.x' into 2.1.x

Conflicts:
	project/build.scala