with PW. There are several other variables that can be merged now, but these
three were easier and required changes to a very small number of routines.
git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@11983 c92efa57-630b-4861-b058-cf58834340f0