Bug 445937 - Code formatter adds unwanted empty lines in front of some
single-line comments

Signed-off-by: Thierry BLIND <thierryblind@msn.com>
Bug 445243 - After disabling PHPDoc comment formatting, only first line
in comment is indented

Change-Id: I0ea20d14c4678589ca2a6d1aa084709011257fdd
Signed-off-by: Thierry BLIND <thierryblind@msn.com>
Bug 446729 - After disabling multiline comment formatting, only first
line in comment is indented

Change-Id: I2fd5db89f9fee8cb25ebb8cf3bd7151839bd4f0d
Signed-off-by: Thierry BLIND <thierryblind@msn.com>
Bug 447363 - "Show In" is not available in PHP Explorer popup menu

Change-Id: I0a9a1de14d6a645d0e144118b37cec484aa695f4
Signed-off-by: Michal Niewrzal <michal.n@zend.com>
Merge remote-tracking branch 'upstream/master'