Merge

Merge

Merge

6941130: Semaphore should throw if number of permits overflows or underflows Summary: Check if release could make number of permits negative Reviewed-by: dl, dholmes

6717164: FilterInputStream.skip incorrectly inherits wording specifying how the InputStream.skip works Summary: restoring the javadoc Reviewed-by: alanb

6921111: NullPointerException in PlainDatagramSocketImpl.socketSetOption Reviewed-by: alanb

6648001: Cancelling HTTP authentication causes subsequent deadlocks Reviewed-by: michaelm

Merge