Merge "Use single name of systemd service for glusterfs server" into release/2019.2.0