Allow overriding Listener wait_for_delay option from CLI
Merge pull request #543 from Dominik-Sauer/wait-for-delay

Allow overriding Listener wait_for_delay option from CLI