Merge changes from origin/7.1

7d74479 Revert "Fixes a memory leak on IE8 in LayoutManagerIE8 (#12688)"
c121c4e Do not fail assertion if re-setting the same lock (#13440)
c0e408c Added nojavadoc parameter to "all" build script.
0417c06 Fixed nojavadoc parameter on "all" build.
71e8c7e Make ExcludeFromSuite annotation Runtime and Inherited

Change-Id: I5395660758e9bc665aaf6eb82ea27d478fa6dfbb

diff --cc client/src/com/vaadin/client/LayoutManager.java
Simple merge

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