Added some enhancements and integration with bamboo build (.war output)