Merge "Add manila service to configuration"