Merged from j2ee6 code in Codedescription is now Serializable.
Authored by: keess 2016-10-10
Parent: [r2925]
Child: [r2927]