Fixes and improvements to the Tabs feature

[Citron, David]

Please consider the following two Tabs-related issues (complete with
patches!)

 

https://issues.apache.org/jira/browse/SHINDIG-689

https://issues.apache.org/jira/browse/SHINDIG-690

 

Thanks!

Dave