Merge from 7.1 to 7.2

Change-Id: I3db340a7c971be6abf18514f044114802edfc4de
Revert "Added ItemSetAddEvent and ItemSetRemoveEvent (#2794)"

This reverts commit 85251833de3bd101d388b20fdb9b02c532a9f1c9.

Conflicts:
	server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
	server/tests/src/com/vaadin/data/util/TestIndexedContainer.java

Change-Id: I49dfdc58ae5841892c6d8e205c520437da9a05e5
Merge branch '7.2'

51c2e93 Revert "Added ItemSetAddEvent and ItemSetRemoveEvent (#2794)"
ee4ae9f Merge from 7.1 to 7.2

Conflicts:
	scripts/automerge7.sh

Change-Id: Ieb61caed4b3b6bbc6d3dc84c02ae8eeed897a144
Merge "Merge branch '7.2'"