Done. Please look.
JIRA: https://issues.apache.org/jira/browse/IGNITE-4501 PR: https://github.com/apache/ignite/pull/1436/files Tests: http://ci.ignite.apache.org/project.html?projectId=IgniteTes ts&tab=projectOverview&branch_IgniteTests=pull/1436/head
