1s less wait when setting up the cluster
Merge branch 'ejhernandez/ha-lower-wait' into 3.5

Conflicts:
	main/ha/ChangeLog