Merge pull request #6551 from samsonasik/fix/cs-trailing-and-unused-use

Fixes CS : trailing spaces and unused use
Merge branch 'hotfix/6551'

Close #6551
Merge branch 'hotfix/6551' into develop

Forward port #6551
Merge pull request #6423 from hschletz/UploadErrorCodeShouldPrecedeEmptyFileCheck

Validate uploaded filename only if no upload error occured.
[#6423] No need to nest conditionals
Merge branch 'hotfix/6423'

Close #6423
Merge branch 'hotfix/6423' into develop

Forward port #6423
 AbstractAdapter::getItem() should return null, when the item cannot be retrieved
[2.3.2] Release readiness

- Updated version constant
- Created changelog
- Updated README
Merge branch 'releases/2.3.2'

2.3.2 release readiness
Merge branch 'releases/2.3.2' into develop

2.3.2 release readiness

Conflicts:
	README.md
	library/Zend/Version/Version.php
Bump to next dev version

- 2.3.3dev
Merge branch 'version/bump'

Bump to 2.3.3dev
Merge branch 'version/bump' into develop

Bump dev versions

Conflicts:
	README.md
	library/Zend/Version/Version.php
Fixed php 5.3 compatibility.
fix and failing testcase for custom barcode adapters in barcode object construtor
update invalid adapter exception message
Merge pull request #6576 from fabiocarneiro/hotfix-custom-barcode-validator

hotfix custom barcode adapter wasn't being set to options.
[#6576] do not use short array syntax

- as we still support 5.3.
[#6576] CS fixes (trailing whitespace)