Merge remote-tracking branch 'origin/develop' into OCF-Doc36-documentation-how-to-manage-dynamic-configuration-2