Add sloppy_quorum and n_val options
Merge branch 'master' into 1.4