Summary of changes:
b2f1f87... Fix build of webservice (*)
ce36f17... Rebase and squash el7 (*)
b573668... Merge branch 'master' into el7 (*)
18cd6ac... Update to 6.0.6. (*)
9a84a2c... Update added updated strings patch. (*)
8bc5efe... Merge branch 'master' into f29
068a588... Correct spec.
(*) This commit already existed in another branch; no separate mail sent