Merge "Align options of glusterfs nova_instances volume" into stable/euphrates