Backport the simplified actions to play2.2.x from master