Merge "Move several config elements into TetheringConfiguration class"