Potato and Olive Berry Salad