[OLINGO-317] Merged the format ENUMs