Changes for port conflicts on server
Updates and jmeter properties