Di fix, retriving same shared instance for different extra parameters, #3192
Code style fix, add braces to BasicClassWithParent.php
Code style fix, trailing_spaces
Update library/Zend/Mail/Transport/Sendmail.php

change key for additional_parameters argument

fix: 
sendmail error
sendmail: illegal option -- r
sendmail: usage: sendmail [ -t ] [ -fsender ] [ -Fname ] [ -bp ] [ -bs ] [ arg ... ]
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'

Close #3260
Merge branch 'master' of git://github.com/craz/zf2-1 into hotfix/3261
[#3261] use -f switch instead of -r

- "-r" is evidently a deprecated/obsolete synonym for "-f", and not
  present on current versions of sendmail (though still present on many
  clones, including postfix, exim, and qmail)
  - updated tests to refer to "-f" instead of "-r"
Merge branch 'hotfix/3261'

Close #3261
Merge branch 'master' of https://github.com/zendframework/zf2