HORNETQ-1161 move more options into schema