Deprecate mox in favor of mox3

Instead of having to use both mox and mox3, just pick
mox3.

Change-Id: I98fde1a748da97db2a8e6ac99d5354b44edb1c28
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Updated from global requirements

Change-Id: I1a4a15eb557cd0d3810738a2cec7fbe22b41ba33
Add support for resource_types

This adds the following commands:
$ heat resource-type-list
$ heat resource-type-show <resource type>

Change-Id: Ifa70da5bc56a5f2979697a9ce2c41fa9a5c1f947
Closes-bug: #1260130
Updates tox.ini to use new features

Reasons:
 - tox update v1.6

Changes:
 - tox 1.6 allows us to skip the sdist step, which is slow.
 - It also allows us to override the install line. In this case, it's
   important as it allows us to stop getting pre-release software we
   weren't asking for.

Original patch by Monty Taylor, talked about here:
http://lists.openstack.org/pipermail/openstack-dev/2013-September/015495.html

Change-Id: Ib51796afbfdffb5a879046ca1b94a55b1f6ef6f1
Merge "Updated from global requirements"
Merge "Updates tox.ini to use new features"
Use jsonutils from oslo incubator

Partial-Bug: #1261224
Change-Id: I9a1e4e661e11a423586869ca504c41028934f8de
Merge "Deprecate mox in favor of mox3"
Merge "Use jsonutils from oslo incubator"