DSVC-99
Merge remote-tracking branch 'origin/master'

Conflicts:
	bdes-reference-client/src/main/java/TestCasesGeneratorTest.java
Merge remote-tracking branch 'origin/master'