(hotfix) fixing calls of Sites::singleton in ClientChangeHandler

patchset 2: addressed jeroens comments

Change-Id: I1c6470061ddcfa9fb9d24038297e6d67b599957e
Merge "(hotfix) fixing calls of Sites::singleton in ClientChangeHandler"