In case if we specify only argument user_choice_method schema
will match both oneOf sections and fail, however it's right schema
and should pass (in other words we need anyOf)
As well fix doc extension to work with anyOf as well
Change-Id: I2b2a3a1c42277a83511cdac81496b5240d983d33