[2.0] cleanup after pr 304#308

bajtos merged 8 commits into

2.0strongloop/loopback:2.0from

feature/cleanup-after-pr-304strongloop/loopback:feature/cleanup-after-pr-304Copy head branch name to clipboard