# GG-9047 - Edition changes
Merge branches 'gg-9047' and 'sprint-27' of github.com:ggprivate/ggprivate into gg-9047

Conflicts:
	assembly/dependencies-optional-datagrid.xml
	assembly/dependencies-optional-hpc.xml
	assembly/dependencies-optional-streaming.xml
	assembly/dependencies-platform.xml
	os/assembly/dependencies-optional-datagrid.xml
	os/assembly/dependencies-optional-hpc.xml
	os/assembly/dependencies-optional-streaming.xml
	os/assembly/dependencies-platform.xml
# GG-9047 - Removed Hadoop edition from Maven
Merge branch 'sprint-27' of github.com:ggprivate/ggprivate into gg-9047

Conflicts:
	os/docs/gridgain_readme.md
	os/docs/gridgain_readme.pdf
# GG-9047 - Edition changes
# GG-9047 - Edition changes
# GG-9047 - Edition changes
Minor fix.