Merge pull request #36 from lissyx/bug1025034

Bug 1025034 - Use WCNSS stuff from device rather than backup folder r=mwu