queue timeouts is now a text input field
sleep a little between codecs selection

This might or might not help with the stability of the "SCCP General /
Customize codecs" scenario.
move Then-step to the end of the file
use wait_until_assert instead on sleep(1)
group timeouts is now a text input field
Merge branch '5228-timeouts'
input an integer (in seconds) in the ring time (timeout) widget

group ring time (timeout) is now an input field
Merge remote-tracking branch 'origin/5228-timeouts-groups'
Revert "queue timeouts is now a text input field"

This reverts commit a8579a7344ba5d2681ac10208854c80dbafa1208.
Merge branch 'master' into docker

* master:
  Revert "queue timeouts is now a text input field"
  input an integer (in seconds) in the ring time (timeout) widget
  group timeouts is now a text input field
  use wait_until_assert instead on sleep(1)
  move Then-step to the end of the file
  sleep a little between codecs selection
  queue timeouts is now a text input field

Conflicts:
	xivo_acceptance/steps/asterisk_steps.py