Merge remote-tracking branch 'upstream/ignite-2.1.1' into ignite-2.1.1
authordevozerov <vozerov@gridgain.com>
Thu, 15 Jun 2017 14:45:24 +0000 (17:45 +0300)
committerdevozerov <vozerov@gridgain.com>
Thu, 15 Jun 2017 14:45:24 +0000 (17:45 +0300)

Trivial merge