Squashed commit of the following:

commit 3c9c52c95fdf1fcbb796f3d972a28d0a421b8fb2
Author: dylans <dylan@dojotoolkit.org>
Date:   Tue Dec 31 15:23:04 2013 -0700

    refs #17651, make router.destroy fail safely if router.startup has not been called

(cherry picked from commit 36a2a4e94c3dc9c758749dae01fd7f6b089e9e5a)