Merge "Make profile.d file consistent between rpm and debian"