squashed from jasonsanjose/travis-sprint-33
use master and release target branches to limit which branches travis will build
enable test task for master and release branches
Merge branch 'master' into jasonsanjose/squashed-cla-check

Conflicts:
	.travis.yml
User can now specify a port for the live dev server
Merge remote-tracking branch 'upstream/master' into livedev-port
pull port pref at time of getServer instead of at brackets load
Merge remote-tracking branch 'upstream/master' into livedev-port
Refactored to detect port changes between LiveDev launches.
return rejected promise in fail case
Merge pull request #6868 from adobe/randy/livedev-exception2

Return rejected promise in fail case
Remove unnecessary server side sanitizePort.
Merge branch 'andoband-livedev-port'
Merge pull request #6759 from adobe/jasonsanjose/squashed-cla-check

Add CLA check to travis build