Update StaxInInterceptor to just create a html error message on the client side as the normal error handling works best on server side.
Initial pass of DoMerges updates for the git repo
Recording .gitmergeinfo Changes