Fully qualify remote name when not in git dir

_get_branch_sha_from_repo does not run with cwd set to the local git
repository, and so the remote name needs to be fully qualified.
Email title tag style

Change tag style of conflict email subject line to conform with preexisting
uses - change [push][conflict] to [push conflict]
Pylint core/git
Pylint test_core_git
Fixup: Unpacking values in submodule check
Clarify submodule errors
Fixup: Actually run gitcommand, strip

_check_submodule_is_fast_forward attempted to access GitCommand return values
without running it first.

Strip was not called.
Fixup: Refactor conflict update
Don't sent email on requeued conflict

In order to prevent a deluge of emails from co-requeued pickmes, don't sent XMPP
or email messages to the user if a conflict was detected with no-requeue set.
Conflicts will still be recorded and tagged.
Fixup: String formatting paren error

Formatting the optional port for pushmanager was incorrectly parenthesized,
resulting in attempting to use string as int.