Changed retry timeout to more retries with shorted interval
Merge branch '2.7.0_paasage' of github.com:dbaur/cloudify into 2.7.0_paasage