modifications and program additions to solve OSG
SOFTWARE-1671 and GRATIAWEB-60.