Merge "Change sync db order and add retries for cinder client"