removed unnecessary comments
make sure oath is not null
centralize the following call in a single place
<instance-ServletContext>.getRealPath("/")
Merge remote-tracking branch 'origin/4.0' into 4.0