resolve build.properties conflict

Signed-off-by: shane-huang <shengsheng.huang@intel.com>
Merge branch 'branch-0.9' of https://github.com/intel-hadoop/project-panthera-ase into panthera-branch-0.9-new