4.2 Release - partial changes

Change-Id: I997e50e77c506c2748094a3279f53475032895c6
Signed-off-by: Michal Niewrzal <michal.n@zend.com>
2 files changed