fixed distribution
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

Change-Id: Idd882ee80402d76aeb54f841f1d7dd94efe3d0eb
Signed-off-by: David Goldberg <david.goldberg@contextream.com>
Merge remote branch 'origin/release-1.0.X' into develop

Change-Id: I4ddd7e3ca9b57565254ab45f231eb112469a9bbd
Signed-off-by: David Goldberg <david.goldberg@contextream.com>