Merge "Update classpath to remove obsolete apps and to fix compile error when importing to eclipse" into cm-11.0