Fixes several outstanding bugs with new hydroponics.
Fixes most of #6300
Trying to add to previous.
Merge pull request #6310 from Zuhayr/dev-freeze

Dev freeze fixes.