Fix failover to dev client
Merge pull request #1 from byliner/fix_client_failover

Fix failover to dev client