Merge "Add Telus NAM config; use egrep where more appropriate than grep" into gingerbread