Added openid_connect namespace to tokeninfo and userinfo
Use merge to set default values