Adapted ServiceRegistry test to properly handle head server threads
Authored by: selig 2011-10-06
Parent: [r5065]
Child: [r5067]
