Merge remote-tracking branch 'origin/upstream' into upstream-rpslvariant

Conflicts:
	whois-commons/src/main/java/net/ripe/db/whois/common/rpsl/AttributeSyntax.java
SCRUM-1684 apnic end-to-end test skeleton, and syntax tests. now just need to setup the pom to enable them
SCRUM-1684 - SyntaxSpec renamed to the more appropriate TemplateSpec, minor fixes
Merge remote-tracking branch 'origin/upstream-rpslvariant' into upstream-rpslvariant

Conflicts:
	whois-commons/src/main/java/net/ripe/db/whois/common/rpsl/AttributeSyntax.java
Merge remote-tracking branch 'origin/upstream-rpslvariant' into upstream-rpslvariant
SCRUM-1684 - moved template object parser into helper package
SCRUM-1684 - updated pom profiles to support different testing types
SCRUM-1684 - various test fixes