Fixing infinite replication issue if concurrency exception is thrown
-Reverted change introduced in: 3096b2c
-Reverted change introduced in: 3096b2c

Fixed destination configuration key format in the UI side
Finished implementing conflicts UI
RavenDB-2256 Consider removing NoCache from RavenUrlExtensions
removed java task from default.ps1
Merge branch 'RavenDB-1939' of https://github.com/arekais/ravendb
Merge branch 'RavenDB_2256' of https://github.com/ml054/ravendb
Merge branch 'master' of https://github.com/Corvalius/ravendb