Add support for merging OS::Nova::Server

Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d