ISTWCMS-5007: Adding password per policy, and adding Service content type to the list of types.