Fixes for nested conditionals and rerender.  Rerender now optionally returns
list-of-components, and cmp.priv.elements in containers gets updated to reflect
changes.

@bug W-1925611@
@rev goliver, dchasman@
Merging origin/fabbott/master-pending/rerender-renderif into master