Merge pull request #234 from Edzelopez/4.4

RG-216 Cleanup for 4.4
RG-216 Fixed bugs for grantprograms for 4.4
Merge pull request #235 from Edzelopez/test

RG-216 Fixed bugs for grantprograms for 4.4
GEP-16 Added default grant program to fix compatibility with grant application extension
Merge pull request #236 from Edzelopez/test

GEP-16 Added default grant program to fix compatibility with grant appli...