Merge "Add back the pserver self link and configuration"