Merge branch 'cs/#6967-zend-view-cs-fixes'

Close #6967
Removed query method from mocks after issue 6798
#6968 #6798 - minor CS fixes (default values)
#6968 #6798 - removing explicit method mocking (not required with interfaces)
#6968 #6798 - removing explicit method mocking (not required with interfaces)
Merge branch 'hotfix/#6968-#6790-remove-unused-mock-methods' into develop

Close #6968
Forward port #6968