Eliminate warnings uncovered by Scala 2.10.
Merge branch '2.2.x' into 2.2.x_2.10
Merge branch '2.2.x_2.10' of github.com:/scalatra/scalatra into 2.2.x_2.10