ADEN-975 Preparation for 71M fluid

With this, we'll be able to switch the layouts with code push only
Merge pull request #3057 from Wikia/aden-975-fluid-and-71m-prep

ADEN-975 Preparation for 71M fluid