[CB-2896] fixed error in exif subifd offset calculation for tag 8769
Merge remote-tracking branch 'apache/master'
[CB-2902] re-added long/short tags to template dict, fixed subExifIFD offset