Removed the namespace port option.
Merge branch 'sam_803_detemplatize' into sam_803_flags
Merge branch 'next' into sam_803_flags
Merge branch 'sam_803_flags' into next