Merge "Fix DevStack setup on CentOS 8.3"