Merge "Clean up Table popup menu close handler to prevent a memory leak" from 6.8 (#11840)

svn changeset:25919/svn branch:6.8

Change-Id: If0b414588252226947230cf2f7a5a8ab253cc5d7
Eliminate unnecessary conversions of option keys

Change-Id: I5f3b267cec0357fe1a1c1a13bafdf3c1f3b6d426
Clear items in ComboBox only if changed (#10924)

Selection is now sent only as a key, removed redundant attribute on the
item.

Change-Id: I882d4ae17a1dc91f7a55a0b4a94e47c078ffc022
Fix NPE if there's no query in the URI (#11836)

Change-Id: I8960e5917ffb0988e705599d1fe5e8aacf2654ef
Support non-trivial SASS media selectors (#11455)

This change adds support for media selectors with a query that consist
of more than just a single word.

Change-Id: Id6a09de8e88984ad052321ae93ffa2e7c2ba1c04
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