Adding two files missing in last merge and reverting some code to take care of code review
comments
Merge pull request #15 from Juniper/nova-icehouse

Adding two files missing in last merge and reverting some code to take c...