s4-common: move netmgr props from common to proprietary-files.

Change-Id: Ib994c7a7babe23ce65c2122993f0b493cb82d37d
s4-common: fix typo when renaming netmgrd

Change-Id: Ie23317ae006ba8d89f52ecead5a6d6e4bf9dad93
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2