Code Review changes - resending

Resending https://github.com/apache/stratos/pull/76/ to tenant-isolation-feature branch