Merge pull request #1 from Internet2/master

merge with upstream
Merge remote-tracking branch 'upstream/master'
re-enable these depenedencies -- needed for clean build
Merge branch 'master' of github.com:Internet2/Shibboleth-Multi-Context-Broker

Conflicts:
	mcb-project/pom.xml
Merge branch 'master' of github.com:Internet2/Shibboleth-Multi-Context-Broker