Merge ~morphis/snappy-hwe-snaps/+git/network-manager:b/consistent-config-item-names into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

[Simon Fels]

wifi: be consistent with configuration item naming and use wifi prefix

[Matteo Croce (teknoraver)]

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:459c0084ad63fa672279c7608e1472904ed9723b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1250/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/319
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1158/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/980
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/1/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1250/rebuild

review: Approve (continuous-integration)

[Matteo Croce (teknoraver)]

review: Approve

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 48276fb..436b746 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -2435,7 +2435,7 @@ wake_on_wlan_enable (NMDevice *device)
 	}
 
 	value = nm_config_data_get_connection_default (NM_CONFIG_GET_DATA,
-	                                               "wireless.wake-on-wlan",
+	                                               "wifi.wake-on-wlan",
 	                                               device);
 
 	if (value) {