updating tests
#182381 - [PHPDoc] wrong auto-generated values for @global and @name
Merge of http://hg.netbeans.org/core-main/
#197534 - Improve efficiency of HighlightingManager together with View Hierarchy.
#199871 - Bad position of the caret when generation php doc
Automated merge with http://hg.netbeans.org/web-main
resolving editor warnings
Automated merge with http://hg.netbeans.org/web-main
fixed Bug 199813 - Some critical bugs in Solaris Studio - CR 7050814 - ProC: Wrong code completion
(transplanted from fffa1b2095ae2e2e9020afcda0d53ef82ac1b34f)
(transplanted from 76168a0e0443412c62a898fee3a118ab3c109d37)
Bug 196512 - NullPointerException at javax.swing.plaf.basic.BasicTextUI.uninstallUI
Automated merge with http://hg.netbeans.org/jet-main
Unit test added
Parent directory added to remote file
dependency on org.jdesktop.layout removed
Bug 197022 - NullPointerException at org.netbeans.editor.Annotations$1.propertyChange fixed. The race condition is still there ...
#199773 one more possible place for loop
Merge of http://hg.netbeans.org/core-main/
Issue #199868 - Can't see remote changes in the [file] diff view
better synchronization between diff and status view modes
stabilizing tests