Fixing typo

Typo in check to see if this is a merge job and should skip
the releasenote check
Only rebuild charms if they exist in the module

Change-Id: I7d0280167bf3b20b4059aca7f62ab42daf3cab4b
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>