Checking in changes prior to tagging of version 1.17.1.
Fix undefined property
further fix for jsonc extension install
Checking in changes prior to tagging of version 1.17.2.
Merge branch 'master' into develop

Conflicts:
	composer.json