Merge "Resource config parameter name changes in SB" into tizen_2.1