Merge "Moves extension files to routes"
Merge "Secure root password on restore from backup after root-enable"
Merge "Use same Nova Client throughout Fresh Instance Task"
Add RPM class implementation

implements blueprint rpm-integration

Change-Id: I4aa06c75b555d0c9ab54791b25c612bc5c5805fc
Fix resize volume stuck in "RESIZE" status

While resizing a improper volume, it may stuck in "RESIZE" status and Trove
can't deal with this status with other actions. We need to catch the exception.

Now, resize volume method exists some problems to achieve the goal. This patch
will solve the critical problem firstly.

fix bug 1212767
Change-Id: I868694fc01217ef0e6e8450ce981c4cab544b612
Merge "Fix resize volume stuck in "RESIZE" status"
Add instance cloudinit support

implements blueprint guestagent-through-userdata

Change-Id: Ifb33f149e63d7b9b7ed676da8ff05085ceceffeb
Update oslo.cfg to >= 1.2.0

Need a newer version of Oslo.cfg so we can use DictOpt.

fixes bug 1213192

Change-Id: I9d41d6184c57ecec46403390fac972bd9e76ab17
Guest config file injection

implements blueprint guest-config-through-metadata

Change-Id: Ia389a00ef4c9d0952b9360946e73f2266d6a4574
Merge "Update oslo.cfg to >= 1.2.0"
Reindenting a function call in taskman models

Change-Id: I3bc1c91ae6727a20f242c74dcaa68fd8c7e4a802
Merge "Guest config file injection"
Ensure safe format strings for TroveError

Fixes: bug #1184044
Change-Id: I80f2ac4b87020dd0994c8aee85025dad75d5a3ef
Merge "Ensure safe format strings for TroveError"
Merge "Reindenting a function call in taskman models"
Adds init file for routes directory.

Change-Id: Iaed7aeab1ed3b7bb6e0e17940b0119b220c7f056
Fixes: bug #1215604
Fix admin extension gives 500 when listing instances

Bug# 1210322

Change-Id: Ib2c5e3d43688f0bb002eefc1c1ca4d347aa71f3c
Merge "Fix admin extension gives 500 when listing instances"
Changed system commands depends on OS version

fixes bug #1214120

Change-Id: I3357dd04911a92a4d69fb8d3469f093b0c6b0737
Merge "Adds init file for routes directory."