#718 - fixing build
Merge pull request #777 from jyotisingh/package_repo_bug_fixes

#718 - fixing failing jsunit test
#718 - fixing failing test
Merge pull request #778 from jyotisingh/package_repo_bug_fixes

#718 - fixing failing test