Merge "Fix UI and docker"
authorMichael Lando <ml636r@att.com>
Mon, 20 Feb 2017 19:39:23 +0000 (19:39 +0000)
committerGerrit Code Review <gerrit@openecomp.org>
Mon, 20 Feb 2017 19:39:23 +0000 (19:39 +0000)

Trivial merge