Fix up the feature build to run in RAMDisk on Jenkins
Merge branch 'development' of github.com:aptana/studio3-rcp into development

Conflicts:
	builders/com.aptana.studio.build/build_local.properties