Refactor script resolving interface again

- remove Future from resovler since the idea need additional considerations
- simplify script contents interface
 -extend script dependencies with additional javaHome property

compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest2.kt

@@ -127,7 +127,7 @@ class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolverEx {
     override fun resolve(script: ScriptContents,
                          environment: Map<String, Any?>?,
                          previousDependencies: KotlinScriptExternalDependencies?
-    ): Future<KotlinScriptExternalDependencies>?
+    ): KotlinScriptExternalDependencies?
     {
         val cp = script.annotations.flatMap {
             when (it) {
@@ -136,10 +136,10 @@ class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolverEx {
                 else -> throw Exception("Unknown annotation ${it.javaClass}")
             }
         }
-        return makeNullableFakeFuture(object : KotlinScriptExternalDependencies {
+        return object : KotlinScriptExternalDependencies {
             override val classpath: Iterable<File> = classpathFromClassloader() + cp
             override val imports: Iterable<String> = listOf("org.jetbrains.kotlin.scripts.DependsOn")
-        })
+        }
     }
 
     private fun classpathFromClassloader(): List<File> =