Merge branch 'hotfix/6664'

Close #6664
Remove null bytes in password for LDAP bind
Update test to use setExpectedException

instead of a try/catch block
Noted security announcement in CHANGELOG and README
Prevent null byte-based SQL injection

- Added code to escape null bytes using addcslashes.
Added paragraph detailing ZF2014-06
Merge branch 'security/zf2014-05'

ZF2014-05 patch
Merge branch 'security/zf2014-05' into develop

ZF2014-05 patch
Merge branch 'security/zf2014-06'

ZF2014-06 patch

Conflicts:
	README.md
Merge branch 'security/zf2014-06' into develop

ZF2014-06 patch
Updated CHANGELOG

- Ensure 2.2.8 announcement is present
- Added 2.3.3 changes
Merge branch 'security/zf2014-06'

Updated changelog for ZF2014-06
Conflicts:
	CHANGELOG.md
Merge branch 'security/zf2014-06' into develop

Updated ZF2014-06 CHANGELOG
Conflicts:
	CHANGELOG.md
[2.3.3] Release readiness

- Updated README with date
- Updated CHANGELOG with date
- Upped VERSION constant
Merge branch 'releases/2.3.3'

2.3.3 readiness
Merge branch 'releases/2.3.3' into develop

2.3.3 release readiness
Conflicts:
	CHANGELOG.md
	README.md
	library/Zend/Version/Version.php
Bump to next development version

- 2.3.4dev
Merge branch 'version/bump' into develop

Bump dev versions
Conflicts:
	README.md
	library/Zend/Version/Version.php