[fixed] bacta tank on blue frog. mantis #3191
[fixed] junk dealer. mantis #4739

Change-Id: Ib741187d35d46401a85c4f445af2a8568f425ebe
Merge "[fixed] bacta tank on blue frog. mantis #3191 [fixed] junk dealer. mantis #4739" into unstable