Merge branch 'develop' into 'master'

Develop

See merge request !3
diff --git a/metadata/service/server/amqp/compute.yml b/metadata/service/server/amqp/compute.yml
index 7e77638..2ce7826 100644
--- a/metadata/service/server/amqp/compute.yml
+++ b/metadata/service/server/amqp/compute.yml
@@ -80,9 +80,6 @@
           engine: payloadregex
           match_regex: ^(?P<timestamp>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}.\d{3}\+\d{4}):\s+(?P<pid>\d+):\s+(?P<severity>\w+)\s+:\s+(?P<message>.+):\s(?P<payload>.+)
           timestamp_layout: 2015-09-01 15:56:14.675+0000
-        contrail_vrouter_agent:
-          engine: payloadregex
-          match_regex: (?P<timestamp>\d{4}-\d{1,2}-\d{1,2}\s\w+\s\d{2}:\d{2}:\d{2}:\d{3}.\d{3})\s\w+\s.+\s\[Thread (\d+), Pid (?<pid>\d+)]:\s(?P<message>.+)
       output:
         rabbitmq:
           engine: amqp