Play 2 2 0 updates

Various updates with respect to upgrading to Play 2.2.0