Reserve capitalised identifiers for system variables

Conflicts:
	hacking/env-setup

hacking/env-setup

@@ -5,7 +5,7 @@
 PYTHONPATH=${PYTHONPATH-""}
 PATH=${PATH-""}
 MANPATH=${MANPATH-""}
-VERBOSITY=${1-""}
+verbosity=${1-""}
 
 # When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE
 if [ -n "$BASH_SOURCE" ] ; then
@@ -48,7 +48,7 @@ else
     current_dir="$ANSIBLE_HOME"
 fi
 cd "$ANSIBLE_HOME"
-if [ "$VERBOSITY" = "-q" ] ; then
+if [ "$verbosity" = "-q" ] ; then
     gen_egg_info 2>1 1> /dev/null
 else
     gen_egg_info
@@ -59,7 +59,7 @@ cd "$current_dir"
 # Print out values unless -q is set
 #
 
-if [ "$VERBOSITY" != "-q" ] ; then
+if [ "$verbosity" != "-q" ] ; then
     echo ""
     echo "Setting up Ansible to run out of checkout..."
     echo ""