Fix dependency issues #526

Open
charithag wants to merge 6 commits from charithag/device-mgt-core:master into master