Revert "Single quote iniset argument in merge_config_file"

This reverts commit e2c9fee8ed846aba124a2fc1bba245790ed7ba90.

We have decided that we don't want to support the json-style argument
as described by bug#1374118 (see thread at [1]).

This restores the old behavior of sending the argument in
double-quotes so environment variables get expanded.  As a bonus,
tests for this are added.

[1] http://lists.openstack.org/pipermail/openstack-dev/2014-October/049341.html

Change-Id: I9fc99f3716cc53366907878adb00ae6cf3898f14
Closes-Bug:#1386413
Fix up file-matching in bashate tox test

The current test does not match file files in /lib/* because the
-wholename command is missing the preceeding \*.  The whole command is
a little difficult to understand.

This re-lays the find command, using -prune to skip dot directories
and keeping a hopefully clearer flow of what is being matched.

Change-Id: Idd856e897ff97095fb116294a9187ff4b198fa26
Add pcre devel package for Horizon

pyScss python module uses pcre if available for performance
and it is better to be installed.
This commit adds it for files/{apts,rpms}/horizon.

Change-Id: If711fa222d3f395efd670334c8a84f35d195dc25
Make allow_{resize|migrate}_to_same_host configurable

In preparation for supporting 2 node devstack jobs, where the first node
is an all in one and the second is a compute node. Make nova config
options allow_resize_to_same_host and allow_migrate_to_same_host
configurable so we can turn them off when we have two compute nodes.

Change-Id: If6989200b56c4597d6e8506d0dda2cc75d0881f1
Merge "Fix up file-matching in bashate tox test"
Merge "Revert "Single quote iniset argument in merge_config_file""
Merge "Make allow_{resize|migrate}_to_same_host configurable"
Merge branch 'master' of https://github.com/openstack-dev/devstack