Fix junit.framework.Assert deprecated warnings
Private/package private/public options in auto-import.

 #KT-5360 Fixed
Merge branch 'autoimport-filter' of github.com:adkozlov/kotlin-eclipse into autoimport-filter

Conflicts:
	kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/quickfix/KotlinAutoImportMarkerResolutionGenerator.java