Also, reorder the elements in configtx.yaml for logical consistency with
the config model.

Change-Id: I54d4387c890cdfea708c0a74435bc38d5cf203b1
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>