more w/s fixes
apply whitespace_scan_failed_patch to fix srctar buildbot scans

http://sea-alljoyn-build:8050/builders/srctar_notification/builds/22/steps/scan_whitespace/logs/whitespace_scan_failed_patch.txt/text
fix build
INSP-143 - Cleanup for Ubuntu