[fixed] mantis 3986 moved theed merchant trainer

Change-Id: I4f4987fde6f99b1febd13eef1cdf30acc386981e
Merge "[fixed] mantis 3986 moved theed merchant trainer" into unstable