Merge branch 'hotfix/BUG-9787'
BUG-9915 Fixed check for null value in getMandatoryOption
Merge branch 'hotfix/BUG-9915' into develop
Merge branch 'develop' of https://github.com/hortonworks/hoya into develop