Merge "fix a minor bug when detecting server image flavor"