Added switches to turn off optional packages which are present.
Merge branch 'build_switches' into develop