[PEP8] strip trailing whitespace

Change-Id: I8b979e9c4433ab67ec87f1d765638f23f9f7b52c
[CONFIG] update namespace aliases

Change-Id: I43862a6e775fc1ab91f8e693eb5b174c77d3ee07