Merge "Allow edit service button to be shown on service context menu in recreate...