integrated changes from trunk
introducing software entities, yay
reverting to r47996 , before the Software entities introduction
added fields collectedfrom and dateofacceptance to the instance type
fixed version name
codebase used to migrate to java8 the production system