Merge "Delete glusterfs server and client inclusions for keystone deployment according to new method for fernet and credential keys rotation"