Fixed three bugs in the application template code.
Moving soft delete code back inside jetty area, since code being placed depends on jetty being there.
Merge pull request #466 from projecthydra/feature/HYDRASIR-373

Fixed three bugs in the application template code.