Added support for tagging based on broker tags matching AWS tags and
fixed a bug where AWS-specific tags were getting lost.