double commit of 0c3a7528567c5d0ce185094b99dce51f74c3383a in 2.0 branch to enable contrail nova packages and proper versions of euca2ools and python-boto for 1404/icehouse

Change-Id: Idbd295b937a2cb7d9d9f1ae7012467c6f7d03c05
Merge "double commit of 0c3a7528567c5d0ce185094b99dce51f74c3383a in 2.0 branch to enable contrail nova packages and proper versions of euca2ools and python-boto for 1404/icehouse" into R2.0