fixed bugs in deployment module

Change-Id: I0aff90f4abba485da5a654d5c85f50ef574dd09b
Merge "fixed bugs in deployment module" into dev/experimental