[Changed] Removed superfluous junk dealers in Coronet
[Changed] Other junk dealers junk prefereneces changed to weapons 

Change-Id: I2162826165ea792dbbe5273b0e9d40feeff9ed9d
Merge "[Changed] Removed superfluous junk dealers in Coronet [Changed] Other junk dealers junk prefereneces changed to weapons " into unstable