Merge branch '2.1.x' into 2.2.x

Closes gh-21754

Author: wilkinsona

spring-boot-project/spring-boot-cli/src/main/executablecontent/bin/spring

@@ -100,7 +100,7 @@ if [ ! -d "${SPRING_HOME}" ]; then
 fi
 
 [[ "${cygwin}" == "true" ]] && SPRINGPATH=$(cygpath "${SPRING_HOME}") || SPRINGPATH=$SPRING_HOME
-CLASSPATH=.:${SPRINGPATH}/bin
+CLASSPATH=${SPRINGPATH}/bin
 if [ -d "${SPRINGPATH}/ext" ]; then
 	CLASSPATH=$CLASSPATH:${SPRINGPATH}/ext
 fi