Finish play 2.2 upgrade