Doing small changes for the new Java Config and Spring Data Rest

Change-Id: I4b25f185196d7b0f592c9a3801735010686b7513