Minor distro-agnosticing

A few minor changes to make the ops guide a bit more distro
agnostic.

Change-Id: I4b1b158f41e11c9858e655a3a2bc2e5c38b5ee39
Merge "Minor distro-agnosticing"