In the common-config patch, I'm going to be using 'conf' as the name of
the variable holding configuration values rather than 'options.
This patch does the renaming across the codebase without making any
functional changes.
Change-Id: I3a86fc01fc76825d6d1e86af882eb8245828ce5f