Fixed ADSC loader to cope with invalid diffraction metadata
Added unit test for invalid metadata
ADMIN: complete move of dependency back to Java 6.
Fixed wrong code in remove method and refactored some code