Adjust feedback response and comment Ids to match new feedback question Id
Merge branch 'master' into Issue2760
[2760] Incorrect feedback response ID when uploading from backup data