Fix up references to EclipseUtil scope methods
Merge branch 'development' into release