Revert "Fixes for rerender with changing elements (i.e. renderif)."

This reverts commit da75699c4923a2d2920a8b544ac834fce6747f37.

Conflicts:

	aura-impl/src/test/components/iterationTest/basicIteration/basicIterationTest.js
Merging origin/lin/master-pending/backout-rerenderFixCornerCases into master