merge from develop

diff --cc liveboot_testdeploy.sh
index c1be9528f64aaf2b51d50af9e365511cee3be1b9,57e00e8a4fb11136ef6a34d75cc91527d0eb8ea1..3131ccd10ae7e16a36a6eff9cb385defe2c59759
--- 1/liveboot_testdeploy.sh
--- 2/liveboot_testdeploy.sh
+++ b/liveboot_testdeploy.sh
@@@ -12,10 -12,7 +12,6 @@@ TESTSERVER=pserver
  TESTSERVER_MGMT_IP=192.168.178.49
  TESTSERVER_MGMT_PASSWD_FILE=/etc/jenkins/pserver2.ipmi
  
- ##TFTP_TARGET=/srv/tftp/liveboot
- ##HTTP_TARGET=/var/www/liveboot/
- 
--
  #
  # check if we have a LIVEBOOT_BUILD_NUMBER
  #