Added Scala singleton handling for traits, as well as classes. Fixes JIRA 6950
Added test case for issue #6950
Removed test files added by mistake
Added comment to JavaClass.java
Merge remote-tracking branch 'jamespic/master'