EDIT

ref #2939 taking configurations out of the compenent scan\n, a more finegraned strategy is needed for the variety of situations we have to deal with

ref #2939 renaming moved class references in log4j files

fix #2939 dynamic configuration of the ehcache store location per remote instance

ref #2939 refactoring CdmCacher to use cachemanger spring bean - not fully working yet

ref #6401 Update jetty plugin to work with jdk1.8

ref #6401 Upgrade jetty plugin to support j1.8

fix #6393 enabling manage services to be accessed via ajax with authentication

fix #6382 proper handling of authentication in cdm_ws_progress.js

Updating develop poms back to pre merge state

Updating develop poms to hotfix version to avoid merge conflicts