Fix APSTUD-8073: 'could not accept changes' error at Themes preferences page.
Revert "Try to fix Aptana Studio RCP build."

This reverts commit 87067691b4aea2b115c5a1c953a53a1631d1b7d5.
Fixing the Studio RCP build.
Update tests to JUnit 4