Add 'password' field to the security service

Change-Id: I8a6d146645b33d7baff52902b7187b09cdbdf63a
Fix xml response for create/update security service

Changed xml template for create/update security service
from SecurityServiceTemplates to SecurityServiceTemplate

Closes bug 1269829

Change-Id: I07f2847b8897cfbc2ee3e1952709925c3c056774
Merge "Add 'password' field to the security service"
Merge "Fix xml response for create/update security service"