Merge "Increase timeout in config pusher for conflicting version ex"