Set build file to use properties for j3
Merge with development
Merge branch 'dev/j3/common' into dev/j3/free