Infrastructure - new property related functionality
Squashed 'root/api/src/main/resources/conf/' content from commit a83aa08

git-subtree-dir: root/api/src/main/resources/conf
git-subtree-split: a83aa087ef54c48e09fe724941858d1e84b8e4ca
Merge commit 'c0b6ce856e3a65e89ec0f85926a007d96875d744' as 'root/api/src/main/resources/conf'