fix for failing flexi branding test
fix for failing instance based test
Merge pull request #405 from skallesh/skallesh

Skallesh