Add option to override instanceId.
Merge branch 'instance-param'
Merge branch 'master' of github.com:getlantern/lantern