Support Keywords in CAPI Component Requests
Raise Lookup Timeout

Some Teamcity builds are failing unnecessarily because of this test.
Merge branch 'master' into capi-keyword-component

Conflicts:
	commercial/test/model/commercial/LookupTest.scala
Merge pull request #5413 from guardian/capi-keyword-component

Support Keywords in CAPI Merchandising Component Requests