Merge branches 'ignite-96' and 'sprint-1' of https://git-wip-us.apach…

…e.org/repos/asf/incubator-ignite into ignite-96

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java

@@ -211,9 +211,8 @@ public void testReloadAll() throws Exception {
             cache.reloadAll(map.keySet());
 
             for (Integer key : map.keySet()) {
-                CacheEntry entry = cache.entry(key);
-
-                if (entry.primary() || entry.backup() || nearEnabled())
+                if (cache.affinity().isPrimaryOrBackup(grid(caches.indexOf(cache)).localNode(), key) ||
+                    nearEnabled())
                     assertEquals(map.get(key), cache.peek(key));
                 else
                     assertNull(cache.peek(key));
@@ -230,11 +229,11 @@ public void testReloadAll() throws Exception {
      * @param cnt Keys count.
      * @return Collection of keys for which given cache is primary.
      */
-    private Iterable<Integer> primaryKeysForCache(CacheProjection<Integer,String> cache, int cnt) {
+    private Iterable<Integer> primaryKeysForCache(GridCache<Integer,String> cache, int cnt) {
         Collection<Integer> found = new ArrayList<>(cnt);
 
         for (int i = 0; i < 10000; i++) {
-            if (cache.entry(i).primary()) {
+            if (cache.affinity().isPrimary(grid(caches.indexOf(cache)).localNode(), i)) {
                 found.add(i);
 
                 if (found.size() == cnt)