add .idea folder to .gitignore pycharm creates this folder

Change-Id: Icbeabe1d3e102d9e447f46be96280e61aa364b74
Fix Wrong syntax for set:tag in dnsmasq startup option

Looks like the introduction of quotes in fix for previous
bug 1012443 was erroneous.

Fixes LP# 1152504

Change-Id: Ic84739e38e3b3567f1617302a33623de03196f85
Merge "Fix Wrong syntax for set:tag in dnsmasq startup option"
Merge "add .idea folder to .gitignore pycharm creates this folder"
Merge remote-tracking branch 'm_src_repo/master' into build-temp