Merge pull request #48 from sshnaidm/ipv6

Upgrade from upstream 28.10.2015
Remove XML tests of admin servers