Merge pull request #176 from apache/local-custos-integration-fixes

Fixes for running the Custos portal against a local Custos deployment