Changes in support of Play 2.2

We will need to wait until 2.2 is in RC form at least, but here's a branch representing the changes required for Play 2.2.