Update merge specification for the master branch.

Change-Id: Ia8ad2d2e44e2d29bfa9e2271e4e4cad0a672ec22
Fixed a typo in UI class Javadoc. #11804

Change-Id: I609489bd9022285565e227e63b11a73e91831503
Fixed a typo in @Widgetset annotation Javadoc. #11803

Change-Id: Iba58755f7a70d92d0a48395abc271f7bc5dcfd73
Merge changes from origin/7.1

7d9f544 Test for #11396 (merged from 6.8 branch). Depends on a blur event so cannot be autotested with TB.
d09b586 Don't start merging if there are uncommitted changes
5388dce Fixed IllegalSyntaxException when using spaces in path #11782
96b6250 Form field and layout Aria corrections (#11785)
9bd7c2b Fixed order of tests in LayoutTesterApplication #11796
f2c2236 Replaced css inject hack in TestUtils with Page.Styles.add() #11798
571792e Remove old widget hierarchy hack that caused problems (#11752)
1b18807 Remove pre-loader element after pre-loading, fixes #10863
e285119 Move .v-assistive-device-only out of @mixin base-common
762c924 Update test to work with the new debug window
ce9c818 Instead of applying workaround to the root panel, apply it to the sub window content element instead to prevent scrolling of the document when a sub window is removed. #11713 (#10776)
3f5d022 Liferay 6.2 compatibility (#11751)
ffd1c1b Don't ignore child component margins in AbstractOrderedLayout (#11553)
62ae5e1 More verbose output from running Jetty
21d9b67 Add a large number of debug calls to VFilterSelect (disabled by default)
bdb7931 Merge test for #11623 to 7.0.
19e27a1 Move suggestion popup width calculation from connector to VFilterSelect
42d9476 Merge changes from origin/7.0

Change-Id: I2c02268adcb7c81bd7f0c465be152c1d88293532
Revert "Assert that connector needing layout is attached (#11698)"

This reverts commit cb7b02d4e50e91b9377410e79c3578587a900d94

The assert is not a good idea because it is triggered when a connector registers a dependency in its init method.

Change-Id: I3709c4749927e0333b7557cf553080b770639e50
Show loading indicator immediately in init as before (#11850)

Change-Id: Ibe91db13b301aaf0a2b5e6e5fb08f566bf5cadab
Merge changes from origin/7.1

55ea6dc More specific workaround for no rows in TreeTable with pagelenght = 0 (#9203)
dca728c Warn if using old widgetset (#11836)
936439d Verify that tests are run with the expected JRE version (#11835)

Change-Id: I0a19ce453cd4215d3bc48a67494d06ff4fe85e8e
No-op merge from origin/7.1

7a1ab60 Revert "Assert that connector needing layout is attached (#11698)"

Change-Id: I7a89760ff502e2957d0b6d489fa93de5582e164e
Merge changes from origin/7.1

29eeda5 Merge "Clean up Table popup menu close handler to prevent a memory leak" from 6.8 (#11840)
6d7f5e4 Eliminate unnecessary conversions of option keys
b8c6a15 Clear items in ComboBox only if changed (#10924)
42545ac Fix NPE if there's no query in the URI (#11836)

Change-Id: I211f8f2e0367588da17631219ebf6e69b02ea701
Merge commit 'a52ceb9659033'

Conflicts:
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java

Change-Id: Ibaff127e9717b85461301a82d1e381c40c06b28a
Merge changes from origin/7.1

1a6200e Merge #6880 test from 6.8; fix itself is not needed in Vaadin 7
67696f3 SQLContainer.indexOfId() also searches backwards (#11849, #10376)
0a437a5 Revert "Replaced css inject hack in TestUtils with Page.Styles.add() #11798"
611e5f9 Test for #11267 adapted from 6.8.

Change-Id: Idb91964c495a7d46ebf468896ff968a35c417397
No-op merge from origin/7.1

b79c0aa Show loading indicator immediately in init as before (#11850)

Change-Id: I1fca59b6fa9007f496d3bf1583d16a1fba9c7f5d
Merge changes from origin/7.1

145a3e3 Send browser window resizes if there is a listener (#10055)
609acd1 Fixed table height rendering in Android 2.3 #11331
3dd6b44 Show tooltip on focus for DataField for AT (#11865)
4235382 Add ARIA presentation role to FormLayout (#11866)
f1130fa Reset focus after selection from ContextMenu (#11476)
fa0c9f5 Allow to close a context menu with ESC key (#11869)
656eaa5 Tweak TooltipConfiguration test to pass in IE9 and IE10
63dd611 Centers VOverlays in visual viewport on iOS, Android, fixes #11614
5a33d7d Test for #11775
0c8edf1 Avoid marking AbstractField dirty in primitive getters (#11201)
6c64757 Remove JavaDoc dependency to vaadin-server from PageState (#11873)
2f6d5e0 Tooltip accessibility fixes (#11799)
9b6b735 Merge changes from origin/7.0
1205e87 Merge commit 'a52ceb96590333' into 7.1
5a93038 Commit and push everything before a conflicting commit
73a50db Merge changes from origin/7.0

Change-Id: I63b89036a5973ca4ce14a6b3347f15c548e96169
Ignore changes merged from the previous maintenance branch

Change-Id: I16a203db76fd6dc7e091a2b2708f80b9d4cef079
Escape \ in commit messages

Change-Id: I1c5773dd593d7877833a5b1798f3e812b53a1b1e
Merge changes from origin/7.1

2772641 OSGi support for vaadin-push (#11691)
42c4b20 Use "\0" instead of "|" as a push message delimiter (#11692)
778de06 Derive current servlet/portlet from the current service (#11779)
f8fb8b7 Upgrade to Atmosphere 1.0.13 (#11861)
fea4c5e Don't build and publish sources for package without source files
6a7683b Disable Atmosphere version number check (#11890)
ebb92e6 Improve error message if vaadinPush.js failed to load (#11673)
70131cd Extracted common code for number conveters to abstract super class (#11900)
0b63506 Fixed order of parameters in javadoc (#11158)
6bf83a4 Modified the logic in setPropertyDatasource which determines if a new converter is needed (#11863)
53a9c11 Fix TestingPushConnection.init signature (#11673)
05ef43f Updated client-compiler to depend on client-compiler-deps 1.0.2 #11879
9686323 Added isInitialStateChange to StateChangeEvent (#10477)
7cced5e Fixed test which had never passed
ada3311 Avoid creating an instance of every view while searching for the correct view (#11722)
5b35dd9 Added text file encoding and line delimiter info (#11907)
f8c4f99 Prevent spurious "Could not determine ApplicationConnection" error when using the debug window
8a42394 Fixed locators in test (aria div conflict)
6de01ac Fix text / javascript mismatch issue in Chrome (#11275)
f7f1e3e Added Java Date to Sql Date converter to better support sql dates (#11224)
2882cf9 Added Serializable where missing and ignore classes which do not need Serializable
4d7f190 Make access() enqueue the runnable if the session is locked (#11897)
4c2b86d Stop using PlaceHolder widgets in VTabsheet (#11026)
87018cd Add missing license header
cb1f63b Send window mode changes to the server immediately (#11737)
e52df7c Added ComponentConnector.isAttached (#11928)
2b5ba96 Define how CurrentInstance works with access() (#11897)
d345838 Remove ThreadLocal references from CurrentInstance (#11914)
bb7b404 Remove outdated testing (#11897)
f64d944 Merge "event not reported as target when context clicking in month view" to Vaadin 7.1 (#10217)
51c9fb5 Fix debug window SEVERE style, add styles for FINE, FINER and FINEST (#11891)
3b888fe Support nested SASS imports (#11909)
b2137f5 Ensure calendar panel is updated when range changes (#11940)
f8319eb Avoid deadlock checking in runPendingAccessTasks() (#11897)
51a98a3 Moved enums to avoid running them as tests
7c613d1 Exclude parsers from checkstyle as they are generated
35f3532 Fixes current text being overwritten in server update on RTA #11741
a744d21 Remove UI.runSafely and VaadinSession.runSafely (#11901)
84edd19 Make test independent of browser language (#11940)
a3ad62d Updated to custom build of Smartsprites 0.2.10 which includes a fix for SMARTSPRITES-36 (#9959)
a9afca6 Moved Locale data handling to LocaleService (#11378)
5e548ae Fixed javadoc compilation error
91182e2 Extract ProgressBar and deprecate ProgressIndicator (#11925)
a5b8209 Add primary style name support for ProgressBar/Indicator (#9913)
86b3689 Make ProgressInidcatorConnector use VProgressIndicator (#11925)
29fcadc Flush the output writer in case of SSE transport as well (#11955)
5e26b0b Fix streaming issue with iOS6 (#11934)
1b274c4 Limit sub window minimum size (#11510)
46cc08b Remove workarounds for broken Timer.cancel in IE (#11872)
d850db6 Add XML formatting instructions (#11956)
9a3dc4e Formatted XML files using defined rules (#11956)
57b7335 Fixed spelling mistake in API #11741
587e10b Fix stale info in javadoc for accessSynchronously (#11897)
36fd94a Remove IE6/IE7 permutation (#11954)
cccff37 Do not log legacy warnings in JUnit tests (#11963)
0f9b689 Throw exception if VaadinService has not been initialized (#11961)
1ed0980 Move ApplicationConnection.setOverlayContainerLabel to VOverlay (#11965)
0014563 Extracted dialog style to a separate block (#11734)
b82e60b Add missing dialog maximize/restore icons for Runo (#11734)
0d046d6 Add a separate debug window section for profiler output (#11950)
03830ae Ignore style resource that has already been added (#11667)
84bf5a7 Enabled drag & drop to Calendar #11048
6c36784 Merge commit '34e6c60a5a746c0306c3a84ae8d6c21dfd84d878' into 7.1
a82d57e Merge changes from origin/7.0
666dbb5 Use window.console instead of just console in vaadinPush to appease IE (#11980)
93751c1 Use correct day names when formatting dates (#6207)
19d0082 Fixed javadoc references
e6e752d Correctly decode summaries containing quotes (#11769)
54ed269 Log stack trace using fine when logging toString warnings
8d655f6 Move VaadinSession.runPendingAccessTasks to VaadinService (#11964)
b1ab27a Update broadcaster tutorial code
e63edcc Update deprecation javadoc for VaadinSession.getBrowser()
132eee5 Add @VaadinServletConfiguration (#11970)
aa99259 Send connector debug (highlight) using RPC (#11536)
6d4582e Change analyze layouts to use RPC (#11536)
6f912b1 Rename tests so they are run during build (Abstract* is ignored)
ebd4a5c Added missing rpc interface (#11536)
edca409 Allow customizing client-side push config on server side (#11867)
b0574f7 Add transport parameter to @Push (#11966)

Change-Id: I4670c783fec829f81890e2d645d93dd40860b909
Merge commit 'a9ff7993c2f0e3f3412ef68a236aa2eb02385c64'

Conflicts:
	server/src/com/vaadin/ui/UI.java

Change-Id: I5919e3138b6eacde6b3db843f5f05425b30d7b99
Merge changes from origin/7.1

9100cfc Do not rely on broken javadoc features for default values (#11970)
fad7bf7 Remove DEFAULT constant as an annotation enum cannot use it (#11966)
1f14422 Merge changes from origin/7.0
9b38072 Exclude provided portal-service from all zip (#9823)
8f4add9 Fixed button highlighting when dragging #10917
8eb567e Make UI.pushConnection transient to prevent null resource after deserialization (#11809)
9efd4d6 Fixed test issues
1b0a214 Pass ConversionException to getConversionError (#11960)
bca14c0 Correctly report theme version in the debug window (#11442)
f9bffed Fix for NPE in debug window in IE (#12015)
da29e2b Fixed serialization issues
a5ec937 Info section for the debug window (#12019)
d6fca78 Fix race condition in upload with push (#10214)
e7201fd Allow using element resize listeners from javascript connectors (#11996)
e853280 Print warning if in production mode and theme compilation is required (#12031)
d9becf9 Use vaadin-atmosphere without slf4j dependency (#11765)
37bc9e4 Reformatted using Ant editor (#12040)
5adb5c2 Include compatibility web.xml in uitest.war (#11688)
424af57 Move ClientConnector.setParent to Component and Extension (#11777)
074d7b3 Fixed incorrect line breaks (#12040)
2cada0b Reformatted release notes using Eclipse (4 spaces)
a0182a0 Updated release notes for 7.1.0 (#11993, #11991, #11870)
5793a1c Make VaadinServlet use enclosing UI class by default (#12039)
3d9d47d Added type parameter to converter methods (#11895)
ecc2de3 Removed dead code

Change-Id: I68ad269dc46ac03d7285b92e0ebdcd3eda059629
Merge changes from origin/7.1

da0a112 Merge changes from origin/7.0
6ba8938 Restore legacyPropertyToString value parsing logic (#11970)
d5c0ffa Fix NPE when converting null values (#11895)
2aa3096 Avoid string casing problems (#11970)
0f107f3 Update widgetset template (#12053)
eb64fda Add support for rem units (#11279)
5f66766 Using StringTokenizer instead of String.split() in AbstractComponent (#8759)
15b217d Handle push disconnections and reconnections more reliably (#11831, #11922)
47addab Adding isIOs and isAndroid to the WebBrowser wrapper around VBrowserDetails (#11168)
0aa5907 Do not write 404 as a response to all action/event requests (#12056)
55ebe13 Detach and attach when adding or removing the caption wrapper (#11708)
7830af2 Fix GridLayout resize after removing caption (#12011)
53e3a25 DebugWindow resize/move improved, fixes #11937 (also implements shift-resize and alt-move, improves bounds-check)
f2b2ce9 Updated to Smartsprites 0.2.10 (#12069)
29c9b60 SimpleTree styling changed for #12058
da8382d DebugWindow now remembers open tab/section, InfoSection fixed to support being opened at once, for #12058
4f5bcef Info tab is now tab 1, hierarchy tab 2
a089743 Consistently recover from disconnections in IE (#12073)
59103a9 Always notify parent of enable state changes (#12062)
997e9a9 Fixed test issue apparently caused by three levels of classes
54ffbdb Add missing license header

Change-Id: Ifba747964fa0d8265bb468ca555b84dadec9fa0a
Merge changes from origin/7.1

bad3208 Corrected fix and better error checking for action/event request (#12056)
a7957df Fixes broken request listeners (#12056)
d5dbae8 Exclude external classes and FutureAccess
b4fc9bc Define LegacyPropertyToStringMode parameter strings in the enum (#11970)
7fb8080 Don't attempt to run microbenchmarks as unit tests (#8759)
3067b23 DebugWindow sections now use previously empty areas to describe the functionality, for #12058
28f72b6 Highlight on server when highlighting on client, for #12058
86e1a31 VUIDLBrowser no longer requires shift-click to 'highlight component on server', open recursively changed to 'alt-click', for #12058
76b9cd1 DebugWindow styles improved and structured more, for #12058
1befbeb Test using Glassfish 4 (#12075)
78af0eb Specified supported server versions and added Glassfish 4 (#12075)
ad9c350 Fixed test issues with type=null (#11895)
8c4800a Updated to atmosphere 1.0.14-vaadin1
2d54adf Highlight on server was still spamming in one instance, for #12058
0754158 Rename getCommunicationMethod -> getCommunicationMethodName (#12019)
8669f6a Actually compile an IE10 permutation (#12080)
47c199f Add 'transport' GET parameter to AbstractTestUI (#12094)
b637ab5 Reinitialize pendingAccessQueue after deserialization (#12097)

Change-Id: Ie664f5c7ec4be2d4841d8b659d6a3ecd0c11624d