Merge "Slave.jar renamed to Agent.jar"