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/GridCacheProjectionImpl.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictContext.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java

assembly/release-base.xml

@@ -27,6 +27,11 @@
             <outputDirectory>/</outputDirectory>
         </file>
 
+        <file>
+            <source>NOTICE.txt</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+
         <file>
             <source>config/ignite-log4j.xml</source>
             <outputDirectory>/config</outputDirectory>

examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java

@@ -61,6 +61,8 @@ public static IgniteConfiguration configuration() throws IgniteException {
         cfg.setDeploymentMode(SHARED);
         cfg.setPeerClassLoadingEnabled(true);
 
+        cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration());
+
         OptimizedMarshaller marsh = new OptimizedMarshaller();
 
         marsh.setRequireSerializable(false);