Post review changes.
Internal review fixes.

Change-Id: I695acdfbfac9c43b5ab9e9f74656202273808164
Merge pull request #5 from Semihalf/dev-contrail-post-review

Post review changes.