Duplicate appending rank to augement class

For the sample yang model in binding-v2.adoc:
module foo1b {
namespace "urn:test:foo1b";
prefix f1b;

revision 2016-01-01

container a {
}

augment "/a" {
container b {
}
}

augment "/a/b" {
container c {
}
}
}

Class A1 and B1 should be generated for augments respectively, but A11 and B11 instead, since the rank was appended repeatedly in both ReferencedTypeImpl and addRawAugmentGenTypeDefinition。