Merge branch 'devel-newStager' of esg-repo.llnl.gov:esgf-stager into devel-newStager
Fixed build.xml
Merge branch 'devel-scriptFix' into devel