bump timeout up, renew template fix, shelf template removed

Signed-off-by: William Rockwood <wrockwood@tadl.org>