bug #2099: Increased MAD timeout to 30s

(cherry picked from commit 8155950f015b6178db3dcaa4b11622916fd96349)