Merge branch '43-hermesv3_gr-failed-20170607' into 'production'

GFAS: Corrected random rank error that  were not using the correct shapefile index.

See merge request !77