Merge branch 'hotfix/3498' into develop

Close #3498
Merge branch 'hotfix/3499' into develop

Forward port #3499
Fix special key "view_helper_config"
Forward port #3484
Merge branch 'features/port-supermessenger' of git://github.com/blanchonvincent/zf2 into feature/3502

Conflicts:
	library/Zend/View/HelperPluginManager.php
Merge branch 'features/port-supermessenger' of git://github.com/blanchonvincent/zf2 into feature/3502
[#3502] Point flashmessenger to factory class, not implementing class
Merge branch 'feature/3502' into develop

Close #3502
BugFix for hasAcl and hasRole: Both method  ignore default member variables
Removed all @category, @package, and @subpackage annotations

- Per #2743, and following on #2953 and discussion on the ML
- Also removes empty docblocks, and empty lines at the end of docblocks
- Library only; phpdoc is never run on tests anyways, and did not want to
  potentially create breakage due to test expectations that relied on
  annotations. At this time, all tests pass.
Merge branch 'feature/db-oracle-driver' of git://github.com/ralphschindler/zf2 into feature/3485
[#3485] Strip @category, @package, and @subpackage annotations

- Pre-emptive measure, in light of #3508
- Only on new files
[#3485] Update copyright year

- end at 2013
[#3485] CS fixes

- Trailing whitespace
Merge branch 'feature/3485' into develop

Close #3485
Remove category trait

- Was misspelled as "catagory", so my script missed it.
- also updated year to 2013
More catches from @Maks3w

- Many of the classes had malformed docblocks:

/**
* @package ...
* @subpackage ...
*/

- Some had subversion strings!
Merge branch 'feature/docblock-simplification' into develop
replace native in_array with Stdlib
string/int safe inArray implementation