SRAMP-388 	Use jboss version of javax.servlet GAV consistently
changes2
Merge pull request #407 from dvirgiln/SRAMP-388

SRAMP-388 	Use jboss version of javax.servlet GAV consistently
Further tweaks for SRAMP-388
SRAMP-408 Tab completion no longer works in s-ramp CLI
Merge pull request #408 from dvirgiln/SRAMP-408

Sramp 408
Merge branch 'master' of https://github.com/Governance/s-ramp into SRAMP-408

Conflicts:
	s-ramp-shell/src/main/java/org/overlord/sramp/shell/commands/ontology/FeedTabCompleter.java
fix