Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde
am: b5a38f6da5

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions