Fixing serialization bug related to serialization in JobNotificationSubscriptions

Plus namespace cleanup