mmf hacks

Change-Id: Ib9c2aac2c1cc1688c93bcc3061086f5c139374a3
Signed-off-by: Kyle Rockman <kyle.rockman@mac.com>

Conflicts:
	jenkins_jobs/modules/hipchat_notif.py