Merge pull request #558 from e-cuellar/5.2

[BACKLOG-290] The use of "domainid" for the Analysis services is wrong.
[BACKLOG-290] The use of "domainid" for the Analysis services is wrong.