Don't use tenant name from predefined_networks section

Closes-bug: #1385491
Change-Id: Id0cafbe24bd04b967ef98d35b34ae207821f4bfc
Merge "Don't use tenant name from predefined_networks section"