Merge "fixes for contrail 3.0 package dependencies and keystone v3. Supervisor files missing in official contrail-packages."