Cleanup and build improvements

@elingg PTAL
Could we note here that it is the active name node? One name node is active and one is standby.