#6209 - Update test case so it actually tests the thing it should be testing
Merge branch 'samsonasik-fix/viewname'

Close #6470 #6467
Merge branch 'hotfix/#6480-undefined-field-in-zend-http-header-origin'

Close #6480
Merge branch 'hotfix/6209' of github.com:adamlundrigan/zf2 into adamlundrigan-hotfix/6209
Merge branch 'adamlundrigan-hotfix/6209' into develop

Forward port #6469 6209