Removed -prod files and let LR replace existing properties files at deployment
Merge branch 'v1' into v2