Merge remote-tracking branch 'upstream/develop' into tomcat6_support
Merge remote-tracking branch 'upstream/develop' into tomcat6_support
support windows local war files
using cp.get_url instead of up.get_file
docfix in tomcat state
Merge remote-tracking branch 'upstream/develop' into tomcat6_support
Merge pull request #7467 from ranl/tomcat6_support

using cp.get_url instead of cp.get_file int tomcat module