Fixes for indicators API call & constants php
Merge branch 'master' into UN-Habitat-dev