Merge pull request #469 from claco/stable/icehouse

backport - stable/icehouse - Increase delay and retries for lxc cache download