fixes for catalog and auth2-client
fixes for catalog and auth2-client

kbase/kbase-ui,kbase/kbase-ui,kbase/kbase-ui,briehl/kbase-ui,kbase/kbase-ui,briehl/kbase-ui,eapearson/kbase-ui,kbase/kbase-ui,eapearson/kbase-ui,eapearson/kbase-ui,briehl/kbase-ui,eapearson/kbase-ui,eapearson/kbase-ui