update version
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'
fixed the path to credentials dir
removed export from branch
Merge remote-tracking branch 'origin/master'
Removed unused files
Removed unused files
Removed unused files
CLOUDIFY-1935 ignore the tests for now.
Added annotation to exclude tests that do not support IPV6
GS-11239 Fixed leaked node problems
GS-11239 Added terminateManagementMachine to fix leaked node problem
Merge branch 'master' into 1865-project-split

Conflicts:
	pom.xml