Rebase gluster pt2

Align with master