Merge r1904936 from trunk: * r1904936 Add @Deprecated decorations to avoid compiler warnings. Justification: Avoid some compiler warnings Votes: +1: dsahlberg, jamessan