Fix condition
remove debug code
Change order of inheritance
Fix CS
moved include path restore to tearDown, reused stream_resolved_include_path result
backup original include path on setUp and restore on tearDown, unified loading
Update PhpDoc comment
Revert change
Merge branch 'bakura10-fix-3014'
Merge branch 'bakura10-fix-3014' into develop
Merge pull request #4348 from tomshaw/zf4346

Add isActive method Navigation Page Uri.
[#4348] Fixed test errors

- Only inject request if it is an HTTP request
- Allow injecting a null value for request in URI page type
[#4348] CS fixes

- indentation
- trailing whitespace
Merge branch 'feature/4348' into develop

Close #4348
Merge pull request #4400 from noopable/patch-FormElementManager-withParams

Ability to get an element with creation options from the FormElementManager
Merge branch 'feature/4400' into develop

Close #4400
Merge pull request #4401 from tolean/feature/empty_fallback_value

add flag for fallback value
Merge branch 'feature/4401' into develop

Close #4401
Merge pull request #4449 from mtymek/feature/separate_console_route_matcher

Console route improvements
[#4449] docblock fixes

- Ensured docblock references were correct