Set build file to use properties for j2
Merge branch 'dev/j2/common' into dev/j2/free