BugFix for hasAcl and hasRole: Both method  ignore default member variables
BugFix for hasAcl and hasRole: Both method  ignore default member variables
Refactoring as its described in https://github.com/zendframework/zf2/pull/3530
Refactoring as its described in https://github.com/zendframework/zf2/pull/3530
Merge pull request #3544 branch 'hotfix/label-position' Fix #3459
Merge branch 'master' of git://github.com/zf2timo/zf2 into hotfix/3530
[#3530] CS fixes

- Update logical conditions; logical operators go on next line; open
  brace on next line when you have multi-line conditions
- Add file-level docblock to test class
Merge branch 'hotfix/3530' into develop

Forward port #3530
[#3530] Remove @package annotation

- these are removed on the develop branch