Merge "Refactor Subnet.isSubnetOf - reduce number of 'if' statements. Added unitests."