More improvements to property file handling, ensuring that dev props
aren't included in the final war archive
Merge branch 'v1' into v2
Merge branch 'v2' into v3