XD-1063: Fix mqtt props
XD-933: Remove unneeded workaround HATEOAS bug