Changes to match new CakePHP 3 nestedInput support