Merge "Fix undefined variable error when cinder-backup service is enabled."