Merge "Fix problems during build/deployment process"
authorFrank Brockners <fbrockne@cisco.com>
Thu, 2 Apr 2015 11:08:58 +0000 (11:08 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 2 Apr 2015 11:08:58 +0000 (11:08 +0000)

Trivial merge