Merge "BUG-865: removed use of deprecated schema path creation."