[Fixed] time displayed by resource admin command
[Fixed] players can no longer survey/sample a resource that is no longer
in shift but not replaced yet
[Fixed] harvesters will no longer double display a resource that is no
longer in shift but not replaced yet - mantis 4260

Change-Id: Ibfd047bd325280ead460460b6c9f55c118ad8b9b
Merge "[Fixed] time displayed by resource admin command [Fixed] players can no longer survey/sample a resource that is no longer in shift but not replaced yet [Fixed] harvesters will no longer double display a resource that is no longer in shift but not replaced yet - mantis 4260" into unstable