[Fixed] Mantis 4806 & 4791: NBZs for Geo Cave & Rogue Corsec Base

Change-Id: I83fb72b2a30ec2d6b736700c696b7c9b319785a7