Fix #2238
Staging site repository URi is incorrect
Fix #2237
Null ref when attempting to add repository to existing site
Apply CR
Merge pull request #2240 from ogail/slot

Slot bug fixes