Migrate to Play 2.2.0
Refactor metrics filter to avoid pointless partial function