MT 0015863
Merge branch 'master' of https://github.com/devicehive/devicehive-java
MT 0015863 merge with HEAD