Edinburgh have confirmed Scotland prop Alasdair Dickinson will return to the club on a one-year contract this summer.