[Fixed] a vendor cannot be created if the player already has an
un-initialized vendor - mantis 3557

Change-Id: I1340760f526dd670108d1b156e20530fcd1252d0
Merge "[Fixed] a vendor cannot be created if the player already has an un-initialized vendor - mantis 3557" into unstable