Di fix, retriving same shared instance for different extra parameters, #3192
Code style fix, add braces to BasicClassWithParent.php
Code style fix, trailing_spaces
Merge branch 'master' of git://github.com/skolodyazhnyy/zf2 into hotfix/3260
[#3260] CS fixes

- Removed "_" prefix from getCallParameters()
- whitespace between operators and parens
- added braces to logic blocks
Merge branch 'hotfix/3260' into develop

Forward port #3260