AMBARI-6507. Create mappers for models. (onechiporenko)
Merge remote-tracking branch 'origin/trunk' into trunk