Add -tunnelIdentifier

BS now supports multiple tunnels.
Update BrowserStackTunnel.jar
Fix merge conflict in bin/BrowserStackTunnel.jar