Added the Apache htpasswd support for HTTP Authentication
Merge branch 'feature/apache-resolver' of git://github.com/ezimuel/zf2 into feature/3585
[#3585] CS/logic cleanup

- Re-work conditionals to reduce nesting
- Minor whitespace changes
Merge branch 'feature/3585' into develop

Close #3585