Merge branch 'master' into ignite-15896

# Conflicts:
#	docs/2.11.0/extensions-and-integrations/spring/spring-caching.html
#	docs/2.11.0/extensions-and-integrations/spring/spring-tx.html