Restore V1 XML I/O.

This is not built but will be modified to support legacy files.
Merge topic 'restore-v1-io'

689a3db Restore V1 XML I/O.
Missing includes for Fedora 20.
Merge topic 'fedora-fix'

d2abd30 Missing includes for Fedora 20.