Some fixes for fhi2upf, courtesy of Joerg Meyer et al., LeidenZ


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@11262 c92efa57-630b-4861-b058-cf58834340f0