Squash 4.3 changes

Conflicts:
	NatController.cpp
	SoftapController.cpp

Change-Id: I62129c9c9c452763fe1388604d211fca06303d57