Imports for nested generated classes do no work

We have several YANG files in the SFC project that havent been touched in a while that whose generated Java files no longer compile in Fluorine, as can be seen here [0].
 
Here is an example of the compilation errors:
 

18:27:21 [ERROR] /w/workspace/sfc-maven-verify-fluorine-mvn33-openjdk8/sfc-renderers/sfc-ios-xe-renderer/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/urn/ios/rev160308/_native/mls/qos/Map.java:[8,1] org.opendaylight.yang.gen.v1.urn.ios.rev160308._native.mls.qos.Map is already defined in this compilation unit
18:27:21 [ERROR] /w/workspace/sfc-maven-verify-fluorine-mvn33-openjdk8/sfc-renderers/sfc-ios-xe-renderer/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/urn/ios/rev160308/_native/mls/qos/Map.java:[70,37] type org.opendaylight.yang.gen.v1.urn.ios.rev160308._native.mls.qos.Map does not take parameters*18:27:21* [ERROR] /w/workspace/sfc-maven-verify-fluorine-mvn33-openjdk8/sfc-renderers/sfc-ios-xe-renderer/src/main/yang-gen-sal/org/opendaylight/yang/gen/v1/urn/ios/rev160308/_native/mls/qos/Map.java:[71,37] type org.opendaylight.yang.gen.v1.urn.ios.rev160308._native.mls.qos.Map does not take parameters

 
Have there been changes to Yangtools that could have caused this??
 
[0] https://jenkins.opendaylight.org/releng/job/sfc-maven-verify-fluorine-mvn33-openjdk8/43/console