[2.0] Fix conflict resolution#374

bajtos merged 2 commits into

2.0strongloop/loopback:2.0from

fix-conflict-resolutionstrongloop/loopback:fix-conflict-resolutionCopy head branch name to clipboard