DataField merged into Field

Reflects changes in https://github.com/theforeman/hammer-cli/pull/87