Fix NPE
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Stack-Builder into develop
PLFM-1852
PLFM-1837
Merge branch 'develop' of https://github.com/xschildw/Synapse-Stack-Builder into develop
Merge branch 'develop' of https://github.com/xschildw/Synapse-Stack-Builder into develop
Merge pull request #47 from xschildw/develop

Merge changes from release-1.7