IDE-820, IDE-526, IDE-474.  Adjust method scoring to be more java-like wrt primitives
Merge remote-tracking branch 'origin/spec' into spec