BI-181 - Failure to locate properties file during initialization
Merge branch 'BI-181'
Revert "Back out BI-181 changes"

This reverts commit 901ace5fa174cf549fab0fdd4bf0f68883865d75.