TIMOB-16913: Added support for buildtype
TIMOB-16913: Hide build-type option
TIMOB-16913: Shortened if statement.
Merge pull request #5665 from ayeung/timob-16913

TIMOB-16913: Added support for buildtype