Merge pull request #1166 from birarda/assignment

fix domain-server handling of multiple instance agent scripts