Let oslotest manage the six.move setting for mox

This instruction to set up a move in six for the mox module conflicts
with the one in oslotest. We are trying to use mox3 everywhere, so
remove this instruction and let oslotest handle it.
Imported from the incubator change with the same ID.

Change-Id: I59d5799283233f8411044ddb15c8abfc8850014c
Ensure the amqp options are present in config file

This change ensures that the amqp1 will be present into the
configfile even the required python module are not present and
also put them into the correct section, [oslo_messaging_amqp1].

Change-Id: I1005405d7ed51090495688eadbe400dbff7c3cc9
Work toward Python 3.4 support and testing

Change-Id: I766de4fa6f352fa1c9284187134654de1a468622
Merge "Work toward Python 3.4 support and testing"
Imported Translations from Transifex

Change-Id: Ic64d16459fc2dc1449458b2ef64f94cbfe0c0019
Merge "Let oslotest manage the six.move setting for mox"
Updated from global requirements

Change-Id: Ib339bbd3d796ae0ee0462ddb561ef87d43848cb5
Merge "Imported Translations from Transifex"
Merge "Ensure the amqp options are present in config file"
Merge "Updated from global requirements"
merge upstream master