add retries and retry_delay
Merge branch 'bug/DCB-64/betty/master' of github.com:MirantisDellCrowbar/barclamp-glance into bug/DCB-64/betty/master