Merge pull request propelorm#468 from jaugustin/1.6

fix propelorm#466 allow  \ModelCriteria type

Author: jaugustin

Form/Type/ModelType.php

@@ -135,8 +135,7 @@ public function configureOptions(OptionsResolver $resolver)
                 $propelChoiceLoader = new PropelChoiceLoader(
                     $this->choiceListFactory,
                     $options['class'],
-                    $options['query'],
-                    $options['index_property']
+                    $options['query']
                 );
 
                 return $propelChoiceLoader;
@@ -242,7 +241,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setRequired(array('class'));
         $resolver->setNormalizer('query', $queryNormalizer);
         $resolver->setNormalizer('choice_label', $choiceLabelNormalizer);
-        $resolver->setAllowedTypes('query', ['null', 'Propel\Runtime\ActiveQuery\ModelCriteria']);
+        $resolver->setAllowedTypes('query', ['null', '\ModelCriteria']);
     }
 
     /**