fixed a typo in defaultproxy.sh
merge checkpoint 1
Merge branch 'master' of github.com:Governance/apiman
remove old resources