Merge "Even, Even more telecom javadoc." into lmp-mr1-dev