Porting over support for multiinstance and friends from stable5 to stable6. These ports are UNTESTED, but are being pushed so we can try them out with multiple content servers.