Updated submit scripts to process password option correctly.
Modified update_catalog to check for timeout at the top, instead
of within advertise_master_to_catalog.  Previously, it was emitting
a lot of debug messages that suggested it was advertising to the
catalog when it actually was not.