[DependencyInjection] Fix some edge cases with autowiring#16464

fabpot merged 2 commits intosymfony:2.8symfony/symfony:2.8from

dunglas:autowiring-parentdunglas/symfony:autowiring-parentCopy head branch name to clipboard