Error corrections and architecture option updates

Error corrections and architecture option updates

Correction of some errors which are permitting a succesfull build
in the master following these descriptions: http://docs.opnfv.org/en/latest/how-to-use-docs/include-documentation.html#individual-project-documentation

Moving the architecture options to the Container4NFV wiki and
leaving only a reference here.

Change-Id: I7b4debc90997f8812a5681daa8bfa19f90724cef
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com>