ref #8841 cleaning up application context config - step 1