Updated failing unit test
Fixed unit test fix to be more compliant
Merge branch 'master' into HEAD

Conflicts:
	Tests/Controller/CRUDControllerTest.php
Merge pull request #1924 from Bladrak/fixUnitTest

Fix unit test
Merge branch 'sonata-project/master'