Merge branch 'fp2-2070' into 'master'

FPII-2070: FP Updater: rewrite XML parser

Isolate and rewrite the XML parser.

See merge request !21