Also fixed compiler warnings. Change-Id: Ibbc6eee9bbd55f55e46fd5268a2dc206f04f14ea
Artifacts for system testing onos.