More explicit name for requested name
consistent naming
service locator variable
Update FormAbstractServiceFactory.php
Merge pull request #5755
Merge pull request #5755 in master