Fix botched rebase
Add spec for new timeout attribute on deploy resource