cosmetic changes to applicationContext.xml plus google configuration