Committing a round of changes to the custom features

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>
mega commit to bring codebase in line with install profile

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>