# GG-8175 Scala has been updated to version 2.11.2
Merge branches 'gg-8175' and 'sprint-25-6.2.0' of https://github.com/ggprivate/ggprivate into gg-8175
#GG-8506 Fixed visor console license command print.
Manual merge branches 'gg-8175' and 'sprint-27'.
# GG-8175 Remove scala 11.2 compilation warnings and deprecations.
Merge branch 'sprint-27' of https://github.com/ggprivate/ggprivate into gg-8175
gg-9041: Upgrade to Spring 4.x
# GG-8175 Visor libs should be first in classpath.
Merge branches 'gg-8175' and 'sprint-27' of https://github.com/ggprivate/ggprivate into gg-8175
# GG-8175 Visor libs should be first in classpath.
Revert changes to run test on TeamCity without gg-9041 changes.
Unrevert changes.
# GG-9088 Avoid marshaling exception after direct join request
gg-9041: Fix tests: add missing GenericApplicationContext.refresh()
Code conventions fix.
GG-9210 Remove commons-lang dependency from gridgain-ssh module
gg-9134 - refactor
Merge branches 'gg-9041' and 'sprint-27' of github.com:ggprivate/ggprivate into gg-9041

Conflicts:
	os/pom-standalone.xml
	pom.xml
Merge branches 'gg-9041' and 'sprint-27' of github.com:ggprivate/ggprivate into gg-9041

Conflicts:
	os/pom-standalone.xml
	pom.xml
gg-9134 - task number fix