Made changes as instructed during UMA telecon 2013-01-03. Mostly impacted configuration data.