Merge "Update Oslo config sample generator"