Merge "Fix osd monitors ip address"