Follow-up request #6338: keep package id coherent

Change-Id: Id68f9ad09eb460bacaf57ae21ab31bec2bfc0cd2
Update to 6.10-5

Change-Id: I1360b00f3b67e8c36b282cf385d2700cf8957133