Merge "Revert VNFM https" into elalto