DisplayPortal Bug Fix  - Overwrites existing service if service tries to
register again
Merge branch 'stuart_userfeedback' into Student_Trial