Merge "Fix XML Parser related packages names"