Bug 572650 upgrade licenses
domain model
#731
+1,376
−292
Merged