fix for ice-server heartbeat without an access token
Merge branch 'master' of https://github.com/highfidelity/hifi
fix for custom hifi URL lookup
Merge pull request #3879 from birarda/master

fix for ice-server heartbeat without an access token, hifi:// URL