Fix error JSPs for weblogic compatibility
Merge branch '6.3.x' into 'MasterBugFixing'