GIRAPH-587: Refactor configuration options (nitay)