Removed old unncessary bits in the post upgrade.
Revert to last good version.
This shouldn't have disappeared.
Merge branch 'master' into develop

Conflicts:
	qdutil/upfw/upfw_post_script.sh
Revert "Removed old unncessary bits in the post upgrade."

This reverts commit d16aa8475de83ba8086fc0e363ae86dcadc1508e.

Conflicts:
	qdutil/upfw/upfw_post_script.sh