CLOUDIFY-1229
fixed tests - deployment of servlet.war threw exceptions - changed it to simpleStatelessPu.jar instead (in stateless tests)
Merge remote-tracking branch 'origin/master'