Merge pull request #1638 from hwangcc23/fix-1489

Add a timeout: delay_exit_on_zero_displays

diff --cc docs/userguide
Simple merge

diff --cc include/config.h
Simple merge

diff --cc include/config_directives.h
Simple merge

diff --cc parser-specs/config.spec
Simple merge

diff --cc src/config.c
Simple merge

diff --cc src/config_directives.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/randr.c
Simple merge

diff --cc testcases/t/201-config-parser.t
Simple merge