XML parser segfault for EDGE: fixes EUCA-8925
Merge branch 'testing' into team/network/edge