Merge "update according to new schema"

diff --cc test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java
Simple merge

diff --cc test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageConstants.java
Simple merge

diff --cc test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/message/MessageProvider.java
Simple merge

diff --cc test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/JSONObjectFactoryTest.java
Simple merge

diff --cc test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/message/MessageProviderTest.java
Simple merge

diff --cc test/mocks/pnfsimulator/src/test/java/org/onap/pnfsimulator/simulator/TestMessages.java
Simple merge