Adding fixing of CDAP-1044 (Upgrade tool)