Merge pull request #1460 from ppekrol/2.5

RavenDB-2793 & RavenDB-2794
Making sure that we aren't tracking missing includes when we aren't actually tracking them
Merge branch '2.5' of github.com:ayende/ravendb
RavenDB-2835 Fixing parsing issue which caused that after using a commit point to restore index we always set LastIndexedEtag to Etag.Empty because of missing EtagJsonConverter. That in turns caused we reindexed the whole index from scratch.
Merge pull request #1491 from arekais/RavenDB-2835

RavenDB-2835 Fixing parsing issue which caused that after using a commit...
Merge branch '2.5' of https://github.com/ayende/ravendb

Conflicts:
	Raven.Client.Lightweight/Document/SessionOperations/QueryOperation.cs
	Raven.Database/Indexing/IndexStorage.cs
	Raven.Tests/Indexes/Recovery/MapIndexRecoveryTests.cs
after merge fixes
Merge pull request #1492 from ppekrol/master

2.5 to 3.0 merge