L2SS-610: L2SS-611: Prevent assigning self.proxy twice

Corné Lukkenrequested to merge
L2SS-610-self-proxy-twice into master

Closes L2SS-610 Closes L2SS-611

Edited by Corné Lukken

Merge request reports