0.0.37 : Supporting more options like box flavors, and re-organizing forj configuration

Change-Id: I65c0f0d462fc82ebc8d3cdf8e674bdc86ded51f1