James Johnstone extends Edinburgh Rugby stay as centre re-signs ahead of Challenge Cup clash with Wasps