Fix bug where ui:tab does not work inside of aura:if
Merging origin/john/master-pending-tabset-fix into master