Merge branch 'build-full-result-fix' into develop

* build-full-result-fix:
  Don't add None responses to multi result key pagination
Honor flattened attribute in model for rest-json
Fix test to not depend on inner xml order