Correct the position of JNDI in the ordered list of property sources

Fixes gh-1693
Merge branch '1.1.x'