Updated to follow guidelines from latest module pipeline

With coming change to remove temporary static route mapping. :smile: 

<!---
@huboard:{"order":155.0,"milestone_order":6,"custom_state":""}
-->