Bring back into OVERCLOUD_PARAMETERS the *_FLAVOR customization vars
Merge pull request #53 from gfidente/deployment_scale

Bring back into OVERCLOUD_PARAMETERS the *_FLAVOR customization vars