Adding the tomcat-tasks.properties file back in so as to not break the build process.
Adding back a couple files that are apparently clucial to the build process.
Merge branch 'scenario1' into scenario1-s1