Merge "Fix proguard's handling of config files. again." into idea133-milestone