manual merge in 10/10 CCSP drop
Merge pull request #2 from ccsp-yocto/master

manual merge in 10/10 CCSP drop