[Wen Hao] - modified pom file by using catalina property.
Merge remote-tracking branch 'origin/master'