Fixed CO04_06 and cleaned up tests.
Merge branch 'coap-18' of https://github.com/mkovatsc/Californium into coap-18