Feature #2423 #2092: Rename HYBRID to PUBLIC_CLOUD