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

diff --cc server/src/com/vaadin/ui/UI.java
Simple merge