Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'daley', remote-tracking branch 'origin'
Added more junit tests
[maven-release-plugin] prepare release papi-2.6.4
[maven-release-plugin] prepare for next development iteration
Only set result content-type if not blank.