Set timeout for OSTF savana tests in deploy_savanna_simple

Change-Id: I883a4eff2f4ced3ba51162d2b4c6306603846d4c
Merge "Set timeout for OSTF savana tests in deploy_savanna_simple"