Merge "JUnit additions for ONAP-REST"